Merge pull request #508 from cloudify-cosmo/RD-6735-no-stop-existing-…

…instance

do not run stop on existing resource without force

CHANGELOG.txt

@@ -1,3 +1,4 @@
+3.1.5: RD-6735 Do not stop existing resource.
 3.1.4: Update Check Drift Status
 3.1.3: Add account ID property to roles in precreate.
 3.1.2:

cloudify_aws/common/decorators.py

@@ -288,6 +288,7 @@ def get_special_condition(external,
                           node_type,
                           op_name,
                           create_op,
+                          stop_op,
                           delete_op,
                           force,
                           waits_for_status):
@@ -310,6 +311,8 @@ def get_special_condition(external,
     elif 'cloudify.relationships.aws.iam.access_key.connected_to' \
             in node_type and op_name == 'establish':
         return True
+    elif stop_op and (external and not force):
+        return False
     return not create_op and not delete_op or force
 
 
@@ -325,6 +328,17 @@ def get_create_op(op_name):
     # return 'create' in op or 'configure' in op
 
 
+def get_stop_operation(op_name):
+    """ Determine if we are dealing with a stop operation.
+    Normally we just do the logic in the last return. However, we may want
+    special behavior for some types.
+
+    :param op_name: ctx.operation.name.split('.')[-1].
+    :return: bool
+    """
+    return 'stop' == op_name
+
+
 def get_delete_op(op_name):
     """ Determine if we are dealing with a deletion operation.
     Normally we just do the logic in the last return. However, we may want
@@ -420,6 +434,7 @@ def _aws_resource(function,
     operation_name = ctx.operation.name.split(
         'cloudify.interfaces.lifecycle.')[-1]
     create_operation = get_create_op(operation_name)
+    stop_operation = get_stop_operation(operation_name)
     delete_operation = get_delete_op(operation_name)
     if create_operation and '__deleted' in ctx.instance.runtime_properties:
         del ctx.instance.runtime_properties['__deleted']
@@ -494,6 +509,7 @@ def _aws_resource(function,
             ctx.node.type_hierarchy,
             operation_name,
             create_operation,
+            stop_operation,
             delete_operation,
             kwargs.get('force_operation'),
             kwargs.pop('waits_for_status', False))

cloudify_aws/common/utils.py

@@ -919,15 +919,16 @@ def update_expected_configuration(iface, runtime_props):
 
 @with_rest_client
 def post_start_related_nodes(node_instance_ids, deployment_id, rest_client):
-    return rest_client.executions.start(
-        deployment_id,
-        'execute_operation',
-        parameters={
-            'operation': 'cloudify.interfaces.lifecycle.poststart',
-            'node_instance_ids': node_instance_ids
-        },
-        force=True,
-    )
+    if node_instance_ids:
+        return rest_client.executions.start(
+            deployment_id,
+            'execute_operation',
+            parameters={
+                'operation': 'cloudify.interfaces.lifecycle.poststart',
+                'node_instance_ids': node_instance_ids
+            },
+            force=True,
+        )
 
 
 def assign_previous_configuration(iface, runtime_props, prop=None):

plugin.yaml

@@ -2,7 +2,7 @@ plugins:
   aws:
     executor: central_deployment_agent
     package_name: cloudify-aws-plugin
-    package_version: '3.1.4'
+    package_version: '3.1.5'
 
 data_types:
 

plugin_1_4.yaml

@@ -2,7 +2,7 @@ plugins:
   aws:
     executor: central_deployment_agent
     package_name: cloudify-aws-plugin
-    package_version: '3.1.4'
+    package_version: '3.1.5'
 
 data_types:
 

plugin_1_5.yaml

@@ -2,7 +2,7 @@ plugins:
   aws:
     executor: central_deployment_agent
     package_name: cloudify-aws-plugin
-    package_version: '3.1.4'
+    package_version: '3.1.5'
     properties_description: |
       Manage AWS resources.
       Credentials documentation: https://docs.cloudify.co/latest/working_with/official_plugins/infrastructure/aws/#authentication-with-aws.

v2_plugin.yaml

@@ -2,7 +2,7 @@ plugins:
   aws:
     executor: central_deployment_agent
     package_name: cloudify-aws-plugin
-    package_version: '3.1.4'
+    package_version: '3.1.5'
 
 data_types: