Merge pull request #36 from cloudify-cosmo/2.0.6-build

2.0.6-build

Author: EarthmanT

.circleci/config.yml

@@ -1,10 +1,20 @@
 version: 2.1
 
+unittest-post-steps: &unittest-post-steps
+  post-steps:
+    - store_test_results:
+        path: /home/circleci/project/nosetests.xml
+    - store_artifacts:
+        path: /home/circleci/project/coverage.xml
+        prefix: tests
+    - slack/notify_failed
+
 orbs:
-  node: cloudify/[email protected] #orb version
-  wagonorb: cloudify/[email protected] #orb version
-  releaseorb: cloudify/[email protected] #orb version
-  managerorb: cloudify/[email protected]
+  node: cloudify/public-unittest-orb@volatile
+  wagonorb: cloudify/wagon-bulder-orb@volatile
+  releaseorb: cloudify/release-orb@volatile
+  managerorb: cloudify/manager-orb@volatile
+  slack: cloudify/notify-slack@2
 
 checkout:
   post:
@@ -35,31 +45,27 @@ workflows:
           filters:
             branches:
               only: /([0-9\.]*\-build|master|main)/
-      - wagonorb/arch64_wagon:
+      - wagonorb/wagon_311:
           filters:
             branches:
               only: /([0-9\.]*\-build|master|main)/
-      - wagonorb/rhel_wagon:
+      - wagonorb/arch64_wagon:
           filters:
             branches:
               only: /([0-9\.]*\-build|master|main)/
-      - wagonorb/build_bundle:
+      - wagonorb/rhel_wagon:
           filters:
             branches:
               only: /([0-9\.]*\-build|master|main)/
-          requires:
-            - wagonorb/wagon
-            - wagonorb/arch64_wagon
-            - wagonorb/rhel_wagon
       - releaseorb/release:
           filters:
             branches:
               only: /master|main/
           requires:
             - wagonorb/wagon
+            - wagonorb/wagon_311
             - wagonorb/arch64_wagon
             - wagonorb/rhel_wagon
-            - wagonorb/build_bundle
             - node/validate_version_job
             - node/validate_documentation_job
       - releaseorb/merge_docs_job:

CHANGELOG.txt

@@ -6,3 +6,4 @@
 2.0.3: Rerelease with redhat 8 and dsl 1_4
 2.0.4: Upgrade to work with vcd 10.3.2
 2.0.5: Add node_type cloudify.nodes.vcloud.DirectlyConnectedVDCNetwork for supporting SRIOV adapter type
+2.0.6: add plugin_1_5.yaml and handle ctx.plugin properties.

cloudify_vcd/__version__.py

@@ -0,0 +1 @@
+version = '2.0.6'

cloudify_vcd/tests/test_utils.py

@@ -38,6 +38,18 @@
     find_resource_id_from_relationship_by_type)
 
 
+class SpecialMockCloudifyContext(MockCloudifyContext):
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+        setattr(self, 'properties', kwargs.get('properties'))
+        self._plugin = mock.MagicMock(properties={})
+
+    @property
+    def plugin(self):
+        return self._plugin
+
+
 def get_mock_node_instance_context(**kwargs):
     kwargs['node_id'] = kwargs.get('node_id', 'foo')
     kwargs['node_name'] = kwargs.get('node_id', 'foo')
@@ -55,7 +67,7 @@ def get_mock_node_instance_context(**kwargs):
     kwargs['operation'] = kwargs.get(
         'operation',
         {'name': 'foo', 'retry_number': 0})
-    _ctx = MockCloudifyContext(**kwargs)
+    _ctx = SpecialMockCloudifyContext(**kwargs)
     _ctx.node.type_hierarchy = ['cloudify.nodes.Root',
                                 'cloudify.nodes.Compute',
                                 'cloudify.nodes.vcloud.VM']
@@ -109,7 +121,7 @@ def get_mock_relationship_context(**kwargs):
     kwargs['operation'] = kwargs.get(
         'operation',
         {'name': 'foo', 'retry_number': 0})
-    _ctx = MockCloudifyContext(**kwargs)
+    _ctx = SpecialMockCloudifyContext(**kwargs)
     _ctx._context = {'related': kwargs.get('related', {'is_target': False})}
     current_ctx.set(_ctx)
     return _ctx

cloudify_vcd/utils.py

@@ -22,6 +22,8 @@
     OperationRetry,
     NonRecoverableError)
 
+from cloudify_common_sdk.utils import get_client_config as _get_client_config
+
 from vcd_plugin_sdk.connection import VCloudConnect
 from .constants import (
     CLIENT_CONFIG_KEYS,
@@ -146,7 +148,7 @@ def get_resource_id(node, instance, instance_id=None):
 
 
 def get_client_config(node):
-    client_config = node.get('client_config', {})
+    client_config = _get_client_config()
     vdc = client_config.get('vdc')
 
     def _get_config():

plugin.yaml

@@ -3,7 +3,7 @@ plugins:
   vcd:
     executor: central_deployment_agent
     package_name: cloudify-vcloud-plugin
-    package_version: '2.0.5'
+    package_version: '2.0.6'
 
 data_types:
 

plugin_1_4.yaml

@@ -3,7 +3,7 @@ plugins:
   vcd:
     executor: central_deployment_agent
     package_name: cloudify-vcloud-plugin
-    package_version: '2.0.5'
+    package_version: '2.0.6'
 
 blueprint_labels:
   obj-type: