Merge pull request #317 from cloudify-incubator/1.26.0-build

1.26.0 build

Author: EarthmanT

CHANGELOG.txt

@@ -1,3 +1,11 @@
+1.26.0:
+  - RND-555-deprecate-utils-types:
+    - load_from_config relationship
+    - cloudify.rest.BunchRequests node type
+    - cloudify.rest.Requests node type
+    - cloudify.terminal.raw node type
+    - cloudify.keys.nodes.RSAKey node type
+    - configuration_loader node type
 1.25.17: Improve logging message.
 1.25.16: CYBL-2002 - Add option to update secrets if they exist but not by default
 1.25.15: CYBL-2016 Fix runtime_properties update at concurrent reservations.
@@ -73,7 +81,7 @@ v1.21.0:
 - rest support run action as hook
 
 v1.20.0:
-- ssh_key add use_secrets_if_exist property to cloudify.keys.nodes.RSAKey node.
+- ssh_key add use_secrets_if_exist property to cloudify.nodes.keys.RSAKey node.
 
 v1.19.0:
 - hooks add hooks events filtering plugin

cloudify_cloudinit/__version__.py

@@ -1 +1 @@
-version = '1.25.17'
+version = '1.26.0'

cloudify_configuration/README.md

@@ -32,7 +32,7 @@ It will also be used as a target in relationships with nodes consuming the confi
 
 ```yaml
   configuration:
-    type: configuration_loader
+    type: cloudify.nodes.ConfigurationLoader
     properties:
       parameters_json: { get_input: parameters_json }
 ```
@@ -109,7 +109,7 @@ properties with the values relevant as specified in the `params_list`
             deep_error_check: true
             params: { get_attribute: [SELF, params] }
     relationships:
-      - type: load_from_config
+      - type: cloudify.relationships.load_from_config
         target: configuration
 ```
 
@@ -201,7 +201,7 @@ Configuration loader holds the entire configuration in it’s runtime properties
 
 **Relationships:**
 
-* `load_from_config`: Derived from `cloudify.relationships.depends_on` and must be used with target node only, e.g.: `cloudify.terminal.raw`.
+* `cloudify.relationships.load_from_config`: Derived from `cloudify.relationships.depends_on` and must be used with target node only, e.g.: `cloudify.nodes.terminal.Raw`.
 Update `params` in depended node by filter in `params_list` and is called before `configuration` action in node.
 
 **Examples:**

cloudify_configuration/examples/simple.yaml

@@ -2,7 +2,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/5.0.0/types.yaml
-  - http://www.getcloudify.org/spec/utilities-plugin/1.18.0/plugin.yaml
+  - plugin:cloudify-utilities-plugin
 
 inputs:
 
@@ -44,7 +44,7 @@ inputs:
 node_types:
 
   terminal:
-    derived_from: cloudify.terminal.raw
+    derived_from: cloudify.nodes.terminal.Raw
     properties:
       params_list:
         default: {}
@@ -56,7 +56,7 @@ node_types:
 node_templates:
 
   configuration:
-    type: configuration_loader
+    type: cloudify.nodes.ConfigurationLoader
     properties:
       parameters_json: { get_input: parameters_json }
 

cloudify_configuration/tasks.py

@@ -55,6 +55,12 @@ def _handle_parameters(parameters):
 
 def load_configuration(parameters=None, merge_dicts=False, **kwargs):
 
+    if 'configuration_loader' in ctx.node.type_hierarchy:
+        ctx.logger.error(
+            'The node type configuration_loader is deprecated, '
+            'please update your blueprint to use '
+            'cloudify.nodes.ConfigurationLoader.')
+
     parameters = parameters or \
         ctx.node.properties.get('parameters_json', {})
 
@@ -73,6 +79,13 @@ def load_configuration(parameters=None, merge_dicts=False, **kwargs):
 
 def load_configuration_to_runtime_properties(source_config=None, **kwargs):
 
+    if 'configuration_loader' in ctx.source.node.type_hierarchy or \
+            'configuration_loader' in ctx.target.node.type_hierarchy:
+        ctx.logger.error(
+            'The node type configuration_loader is deprecated, '
+            'please update your blueprint to use '
+            'cloudify.nodes.ConfigurationLoader.')
+
     source_config = source_config or \
         ctx.target.instance.runtime_properties.get('params', {})
 

cloudify_configuration/tests/test_tasks.py

@@ -15,19 +15,38 @@
 from mock import MagicMock, patch
 
 from cloudify.state import current_ctx
-from cloudify.mocks import MockCloudifyContext
+from cloudify.mocks import MockNodeContext, MockCloudifyContext
 
 from .. import tasks
 
 
+class MockNodeCtx(MockNodeContext):
+
+    def __init__(self, *_, **__):
+        super().__init__(*_, **__)
+
+    @property
+    def type_hierarchy(self):
+        return [self._type, 'cloudify.nodes.Root']
+
+
+class MockCtx(MockCloudifyContext):
+    def __init__(self, *_, **kwargs):
+        super().__init__(*_, **kwargs)
+        node_name = kwargs.get('node_name')
+        properties = kwargs.get('properties')
+        node_type = kwargs.get('node_type')
+        self._node = MockNodeCtx(node_name, properties, node_type)
+
+
 class TestTasks(unittest.TestCase):
 
     def tearDown(self):
         current_ctx.clear()
         super(TestTasks, self).tearDown()
 
     def test_load_configuration(self):
-        _ctx = MockCloudifyContext(
+        _ctx = MockCtx(
             'node_name',
             properties={},
             runtime_properties={}
@@ -41,7 +60,7 @@ def test_load_configuration(self):
         })
 
     def test_load_json_configuration(self):
-        _ctx = MockCloudifyContext(
+        _ctx = MockCtx(
             'node_name',
             properties={},
             runtime_properties={}
@@ -55,7 +74,7 @@ def test_load_json_configuration(self):
         })
 
     def test_load_configuration_can_merge_dicts(self):
-        _ctx = MockCloudifyContext(
+        _ctx = MockCtx(
             'node_name',
             properties={},
             runtime_properties={
@@ -92,20 +111,20 @@ def test_load_configuration_can_merge_dicts(self):
         })
 
     def test_load_configuration_to_runtime_properties(self):
-        _source_ctx = MockCloudifyContext(
+        _source_ctx = MockCtx(
             'source_name',
             properties={'params_list': ['a', 'c'],
                         'params': {'a': 'e', 'c': 'g'}},
             runtime_properties={
                 'params': {'a': 'n', 'c': 'g'}
             }
         )
-        _target_ctx = MockCloudifyContext(
+        _target_ctx = MockCtx(
             'source_name',
             properties={},
             runtime_properties={}
         )
-        _ctx = MockCloudifyContext(
+        _ctx = MockCtx(
             deployment_id='relationship_name',
             properties={},
             source=_source_ctx,

cloudify_rest/README.md

@@ -15,7 +15,7 @@ Features:
 - configurable recoverable errors
 - context sensitive "response expectation"
 
-Action inputs in `cloudify.rest.Requests`:
+Action inputs in `cloudify.nodes.rest.Requests`:
 * `params`: Template parameters. Default is empty dictionary.
 * `params_attributes`: dictionary with list based path to values in
   `runtime_prioperties`.
@@ -27,10 +27,10 @@ Action inputs in `cloudify.rest.Requests`:
 * `remove_calls`: Remove calls list from results. Default: save calls in
   runtime properties.
 
-Action inputs in `cloudify.rest.BunchRequests` is list of inputs from
-`cloudify.rest.Requests`.
+Action inputs in `cloudify.nodes.rest.BunchRequests` is list of inputs from
+`cloudify.nodes.rest.Requests`.
 
-Node properties for `cloudify.rest.Requests` and `cloudify.rest.BunchRequests`:
+Node properties for `cloudify.nodes.rest.Requests` and `cloudify.nodes.rest.BunchRequests`:
 * `hosts`: list of hosts name or IP addresses of Rest Servers
 * `host`: host name or IP addresses of Rest Servers if list of hosts is not
   needed single host can be provided by this property. NOTE: the 'hosts'
@@ -76,7 +76,7 @@ hooks:
 Supported parameters:
 * `inputs`: passed from cloudify hooks (or first param hooks)
 * `logger_file`: duplicate logger output to separate file
-* `properties`: connection properties(same as properties in `cloudify.rest.Requests`)
+* `properties`: connection properties(same as properties in `cloudify.nodes.rest.Requests`)
 * `template_file`: absolute path to template file
 * `params`: Template parameters, additionally providided `__inputs__` from hooks.
   Default is empty dictionary.
@@ -93,7 +93,7 @@ Supported parameters:
 
 ```yaml
   user:
-    type: cloudify.rest.Requests
+    type: cloudify.nodes.rest.Requests
     properties:
       hosts:
       - { get_input: rest_endpoint }
@@ -111,7 +111,7 @@ Supported parameters:
 
 ```yaml
   user:
-    cloudify.rest.BunchRequests
+    type: cloudify.nodes.rest.BunchRequests
     properties:
       # hosts:
       # - { get_input: rest_endpoint }
@@ -279,5 +279,5 @@ Real life example how F5 BigIP can be provisioned with REST API
 blueprint: [example-5-blueprint.yaml](examples/example-5-blueprint.yaml)
 
 Example for get users list, create new user based on first result and than
-remove new created user. Have used `cloudify.rest.BunchRequests` with
+remove new created user. Have used `cloudify.nodes.rest.BunchRequests` with
 `params_attributes`.

cloudify_rest/examples/example-1-blueprint.yaml

@@ -172,7 +172,7 @@ inputs:
 node_templates:
 
   user10-all-properties:
-    type: cloudify.rest.Requests
+    type: cloudify.nodes.rest.Requests
     properties:
       hosts: [{ get_input: rest_endpoint }]
       port: 443
@@ -185,7 +185,7 @@ node_templates:
             template_file: templates/get-user-all-properties-template.yaml
 
   user10-some-properties:
-    type: cloudify.rest.Requests
+    type: cloudify.nodes.rest.Requests
     properties:
       hosts: [{ get_input: rest_endpoint }]
       port: 443

cloudify_rest/examples/example-2-blueprint.yaml

@@ -14,7 +14,7 @@ inputs:
 node_templates:
 
   user-details:
-    type: cloudify.rest.Requests
+    type: cloudify.nodes.rest.Requests
     properties:
       hosts: [{ get_input: rest_endpoint }]
       port: 443
@@ -27,7 +27,7 @@ node_templates:
             template_file: templates/get-user-all-properties-template.yaml
 
   user-post:
-    type: cloudify.rest.Requests
+    type: cloudify.nodes.rest.Requests
     properties:
       hosts: [{ get_input: rest_endpoint }]
       port: 443

cloudify_rest/examples/example-3-blueprint.yaml

@@ -14,7 +14,7 @@ inputs:
 node_templates:
 
   token:
-    type: cloudify.rest.Requests
+    type: cloudify.nodes.rest.Requests
     properties:
       hosts: [{ get_input: mgmt_ip }]
       port: 443
@@ -30,7 +30,7 @@ node_templates:
               PASSWORD: "admin"
 
   baseline_config:
-    type: cloudify.rest.Requests
+    type: cloudify.nodes.rest.Requests
     properties:
       hosts: [{ get_input: mgmt_ip }]
       port: 443
@@ -50,7 +50,7 @@ node_templates:
       target: token
 
   baseline_networking:
-    type: cloudify.rest.Requests
+    type: cloudify.nodes.rest.Requests
     properties:
       hosts: [{ get_input: mgmt_ip }]
       port: 443