update cicd

.circleci/merge_docs.py

@@ -0,0 +1,4 @@
+from ecosystem_cicd_tools.github_stuff import merge_documentation_pulls
+
+if __name__ == '__main__':
+    merge_documentation_pulls()

.circleci/package_release.py

@@ -0,0 +1,13 @@
+from os import path, pardir
+from ecosystem_cicd_tools.release import plugin_release_with_latest
+from ecosystem_cicd_tools.validations import get_plugin_yaml_version
+
+
+plugin_yaml = path.join(
+    path.abspath(path.join(path.dirname(__file__), pardir)),
+    'plugin.yaml')
+
+
+if __name__ == '__main__':
+    plugin_release_with_latest(
+        'tosca-vcloud-plugin', get_plugin_yaml_version(plugin_yaml))

.circleci/py3fixers

@@ -0,0 +1,24 @@
+--stage1
+-f lib2to3.fixes.fix_getcwdu
+-f lib2to3.fixes.fix_long
+-f lib2to3.fixes.fix_nonzero
+-f lib2to3.fixes.fix_input
+-f lib2to3.fixes.fix_raw_input
+-f lib2to3.fixes.fix_itertools
+-f lib2to3.fixes.fix_itertools_imports
+-f lib2to3.fixes.fix_exec
+-f lib2to3.fixes.fix_operator
+-f libfuturize.fixes.fix_execfile
+-f libpasteurize.fixes.fix_newstyle
+-f lib2to3.fixes.fix_filter
+# fix_dict is not idempotent
+# -f lib2to3.fixes.fix_dict
+-f lib2to3.fixes.fix_map
+-f lib2to3.fixes.fix_zip
+-f lib2to3.fixes.fix_xrange
+-f lib2to3.fixes.fix_basestring
+-f libfuturize.fixes.fix_cmp
+-f libfuturize.fixes.fix_division_safe
+-f lib2to3.fixes.fix_metaclass
+-f libfuturize.fixes.fix_unicode_keep_u
+

.circleci/test_examples.py

@@ -0,0 +1,28 @@
+########
+# Copyright (c) 2014-2019 Cloudify Platform Ltd. All rights reserved
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import pytest
+
+blueprint_list = []
+
+
+@pytest.fixture(scope='function', params=blueprint_list)
+def blueprint_examples(**_):
+    pass
+
+
+def test_blueprints(blueprint_examples):
+    assert blueprint_examples is None

.circleci/validate_docs.py

@@ -0,0 +1,4 @@
+from ecosystem_cicd_tools.validations import validate_documentation_pulls
+
+if __name__ == '__main__':
+    validate_documentation_pulls()

.circleci/validate_version.py

@@ -0,0 +1,12 @@
+from os import path, pardir
+from ecosystem_cicd_tools.validations import validate_plugin_version
+
+package_dir = path.join(
+    path.abspath(
+        path.join(path.dirname(__file__), pardir)
+    )
+)
+
+
+if __name__ == '__main__':
+    validate_plugin_version(package_dir)

plugin.yaml

@@ -8,7 +8,7 @@ plugins:
 
 data_types:
 
-  cloudify.datatypes.vlcoud.config:
+  cloudify.datatypes.vcloud.config:
     properties:
       username:
         type: string
@@ -82,7 +82,7 @@ data_types:
           Only applicable for a private cloud service with self-signed
           certificates. Defaults to True
 
-  cloudify.datatypes.vlcoud.server_key:
+  cloudify.datatypes.vcloud.server_key:
     properties:
       key:
         type: string
@@ -95,7 +95,7 @@ data_types:
         description: >
           The user name.
 
-  cloudify.datatypes.vlcoud.server_customization:
+  cloudify.datatypes.vcloud.server_customization:
     properties:
       public_keys:
         type: string
@@ -128,7 +128,7 @@ data_types:
         description: >
           The script executor. The default is /bin/bash.
 
-  cloudify.datatypes.vlcoud.server_hardware:
+  cloudify.datatypes.vcloud.server_hardware:
     properties:
       cpu:
         type: integer
@@ -141,7 +141,7 @@ data_types:
         description: >
           The VM memory size, in MB.
 
-  cloudify.datatypes.vlcoud.server:
+  cloudify.datatypes.vcloud.server:
     properties:
       name:
         type: string
@@ -159,17 +159,17 @@ data_types:
         description: >
           The vApp templates catalog.
       guest_customization:
-        type: cloudify.datatypes.vlcoud.server_customization
+        type: cloudify.datatypes.vcloud.server_customization
         required: false
         description: >
            The guest customization section
       hardware:
-        type: cloudify.datatypes.vlcoud.server_hardware
+        type: cloudify.datatypes.vcloud.server_hardware
         required: false
         description: >
           The key-value hardware customization section, including:
 
-  cloudify.datatypes.vlcoud.network_dhcp:
+  cloudify.datatypes.vcloud.network_dhcp:
     properties:
       dhcp_range:
         type: string
@@ -187,7 +187,7 @@ data_types:
         description: >
           The maximum lease, in seconds.
 
-  cloudify.datatypes.vlcoud.network:
+  cloudify.datatypes.vcloud.network:
     properties:
       edge_gateway:
         type: string
@@ -224,11 +224,11 @@ data_types:
         description: >
           The DNS suffix.
       dhcp:
-        type: cloudify.datatypes.vlcoud.network_dhcp
+        type: cloudify.datatypes.vcloud.network_dhcp
         description: >
           The DHCP settings.
 
-  cloudify.datatypes.vlcoud.port:
+  cloudify.datatypes.vcloud.port:
     properties:
       network:
         type: string
@@ -257,7 +257,7 @@ data_types:
           Specifies whether the interface is the primary interface (true or
           false).
 
-  cloudify.datatypes.vlcoud.floatingip:
+  cloudify.datatypes.vcloud.floatingip:
     properties:
       edge_gateway:
         type: string
@@ -271,7 +271,7 @@ data_types:
           The public IP address. If not specified, the public IP is allocated
           from the pool of free public IPs.
 
-  cloudify.datatypes.vlcoud.nat:
+  cloudify.datatypes.vcloud.nat:
     properties:
       edge_gateway:
         type: string
@@ -285,15 +285,15 @@ data_types:
           The public IP. If not specified, the public IP is allocated from
           the pool of free public IPs.
 
-  cloudify.datatypes.vlcoud.security_group:
+  cloudify.datatypes.vcloud.security_group:
     properties:
       edge_gateway:
         type: string
         required: false
         description: >
           The vCloud gateway name.
 
-  cloudify.datatypes.vlcoud.volume:
+  cloudify.datatypes.vcloud.volume:
     properties:
       name:
         type: string
@@ -306,15 +306,15 @@ data_types:
         description: >
           Volume size
 
-  cloudify.datatypes.vlcoud.private_key:
+  cloudify.datatypes.vcloud.private_key:
     properties:
       create_file:
         type: string
         required: false
         description: >
           Whether to save the file. Use with auto_generate: true.
 
-  cloudify.datatypes.vlcoud.public_key:
+  cloudify.datatypes.vcloud.public_key:
     properties:
       key:
         type: string
@@ -342,14 +342,14 @@ node_types:
                 description: >
                    Resource Id
             server:
-                type: cloudify.datatypes.vlcoud.server
+                type: cloudify.datatypes.vcloud.server
             management_network:
                 type: string
                 default: ""
                 description: >
                   The management network name.
             vcloud_config:
-                type: cloudify.datatypes.vlcoud.config
+                type: cloudify.datatypes.vcloud.config
         interfaces:
             cloudify.interfaces.lifecycle:
                 create:
@@ -376,7 +376,7 @@ node_types:
         derived_from: cloudify.nodes.Network
         properties:
             network:
-                type: cloudify.datatypes.vlcoud.network
+                type: cloudify.datatypes.vcloud.network
             use_external_resource:
                 type: boolean
                 default: false
@@ -387,7 +387,7 @@ node_types:
                 description: >
                    Resource Id
             vcloud_config:
-                type: cloudify.datatypes.vlcoud.config
+                type: cloudify.datatypes.vcloud.config
         interfaces:
             cloudify.interfaces.lifecycle:
                 create:
@@ -405,9 +405,9 @@ node_types:
         derived_from: cloudify.nodes.Port
         properties:
             port:
-                type: cloudify.datatypes.vlcoud.port
+                type: cloudify.datatypes.vcloud.port
             vcloud_config:
-                type: cloudify.datatypes.vlcoud.config
+                type: cloudify.datatypes.vcloud.config
         interfaces:
             cloudify.interfaces.lifecycle:
                 create:
@@ -423,9 +423,9 @@ node_types:
         derived_from: cloudify.nodes.VirtualIP
         properties:
             floatingip:
-                type: cloudify.datatypes.vlcoud.floatingip
+                type: cloudify.datatypes.vcloud.floatingip
             vcloud_config:
-                type: cloudify.datatypes.vlcoud.config
+                type: cloudify.datatypes.vcloud.config
         interfaces:
             cloudify.interfaces.lifecycle:
                 create:
@@ -443,7 +443,7 @@ node_types:
                 description: >
                    Use predefined resource
             nat:
-                type: cloudify.datatypes.vlcoud.nat
+                type: cloudify.datatypes.vcloud.nat
                 description: >
                   The key-value NAT configuration.
             rules:
@@ -457,7 +457,7 @@ node_types:
                       DNAT.
                     type - The list of NAT types. Can be SNAT, DNAT or both.
             vcloud_config:
-                type: cloudify.datatypes.vlcoud.config
+                type: cloudify.datatypes.vcloud.config
         interfaces:
             cloudify.interfaces.lifecycle:
                 create:
@@ -474,7 +474,7 @@ node_types:
         derived_from: cloudify.nodes.SecurityGroup
         properties:
             security_group:
-                type: cloudify.datatypes.vlcoud.security_group
+                type: cloudify.datatypes.vcloud.security_group
                 description: >
                   The key-value SecurityGroup configuration
             rules:
@@ -494,7 +494,7 @@ node_types:
                     log_traffic - Used to capture traffic. true or false.
                     description - The rule description.
             vcloud_config:
-                type: cloudify.datatypes.vlcoud.config
+                type: cloudify.datatypes.vcloud.config
         interfaces:
             cloudify.interfaces.lifecycle:
                 create:
@@ -514,11 +514,11 @@ node_types:
                 description: >
                   Use to auto-generate the key.
             private_key:
-                type: cloudify.datatypes.vlcoud.private_key
+                type: cloudify.datatypes.vcloud.private_key
                 description: >
                   The key-value private key configuration
             public_key:
-                type: cloudify.datatypes.vlcoud.public_key
+                type: cloudify.datatypes.vcloud.public_key
                 description: >
                   The key-value public key configuration
         interfaces:
@@ -543,7 +543,7 @@ node_types:
                 description: >
                    Device name
             volume:
-                type: cloudify.datatypes.vlcoud.volume
+                type: cloudify.datatypes.vcloud.volume
                 description: >
                   The key-value volume configuration
                 default: {}
@@ -557,7 +557,7 @@ node_types:
                 description: >
                    Resource Id
             vcloud_config:
-                type: cloudify.datatypes.vlcoud.config
+                type: cloudify.datatypes.vcloud.config
         interfaces:
             cloudify.interfaces.lifecycle:
                 create:
@@ -589,7 +589,7 @@ node_types:
                 description: >
                    Resource Id
             vcloud_config:
-                type: cloudify.datatypes.vlcoud.config
+                type: cloudify.datatypes.vcloud.config
         interfaces:
             cloudify.interfaces.lifecycle:
                 create:

setup.py

@@ -32,6 +32,6 @@
         'pycrypto==2.6.1',
         # used in volume creation
         'paramiko>=1.18.3',
-        'fabric>=1.13.1,<2.0', # 2+ branch has API changes
+        'fabric>=1.13.1,<2.0',  # 2+ branch has API changes
     ]
 )