Merge pull request #290 from cloudify-incubator/1.25.9-build

1.25.9 build

Author: EarthmanT

CHANGELOG.txt

@@ -1,3 +1,6 @@
+1.25.9:
+  - Add ignored instance states in scalelist.
+  - Add availabilty states to workflows.
 1.25.8: V2 Plugin YAML types.
 1.25.7: 
   - RD-4587 Handle empty ssh secrets

cloudify_scalelist/README.md

@@ -98,6 +98,7 @@ within one transaction.
 ## Install with one "two" node
 
 We install blueprint with one ["two" nodes](examples/blueprint.yaml).
+
 ```shell
 $ cfy install cloudify-utilities-plugin/cloudify_scalelist/examples/blueprint.yaml -b examples
 Uploading blueprint cloudify-utilities-plugin/cloudify_scalelist/examples/blueprint.yaml...

cloudify_scalelist/workflows.py

@@ -25,6 +25,16 @@
                                          obfuscate_passwords, )
 
 
+IGNORED_STATES = ['uninitialized', 'stopped', 'deleting', 'deleted']
+IGNORED_OPS = [
+    'cloudify.interfaces.lifecycle.unlink',
+    'cloudify.interfaces.lifecycle.prestop',
+    'cloudify.interfaces.lifecycle.stop',
+    'cloudify.interfaces.lifecycle.delete',
+    'cloudify.interfaces.lifecycle.postdelete'
+]
+
+
 def _update_runtime_properties(ctx, instance_id, properties_updates):
     manager = get_rest_client()
 
@@ -622,6 +632,8 @@ def _filter_node_instances(ctx, node_ids, node_instance_ids, type_names,
 
         # look more deeply, what about instance id's and properties
         for instance in node.instances:
+            if instance.state in IGNORED_STATES and operation in IGNORED_OPS:
+                continue
             # sorry no such id in list
             if node_instance_ids and instance.id not in node_instance_ids:
                 continue

plugin.yaml

@@ -3,7 +3,7 @@ plugins:
   cfy_util: &utilities_plugin
     executor: central_deployment_agent
     package_name: cloudify-utilities-plugin
-    package_version: '1.25.8'
+    package_version: '1.25.9'
 
   cfy_files: *utilities_plugin
 

v2_plugin.yaml

@@ -3,7 +3,7 @@ plugins:
   cfy_util: &utilities_plugin
     executor: central_deployment_agent
     package_name: cloudify-utilities-plugin
-    package_version: '1.25.8'
+    package_version: '1.25.9'
 
   cfy_files: *utilities_plugin
 
@@ -829,6 +829,8 @@ workflows:
 
   configuration_update:
     mapping: configuration.cloudify_configuration.tasks.update
+    availability_rules:
+      node_instances_active: [ 'all']
     parameters:
       params:
         description: json string
@@ -845,17 +847,25 @@ workflows:
   # suspend/wake up/resume
   suspend:
     mapping: suspend.cloudify_suspend.workflows.suspend
+    availability_rules:
+      node_instances_active: [ 'all']
 
   resume:
     mapping: suspend.cloudify_suspend.workflows.resume
+    availability_rules:
+      node_instances_active: [ 'all', 'partial']
 
   # force to dump native usage by cloud providers
   statistics:
     mapping: suspend.cloudify_suspend.workflows.statistics
+    availability_rules:
+      node_instances_active: [ 'all']
 
   # backup related workflows
   backup:
     mapping: suspend.cloudify_suspend.workflows.backup
+    availability_rules:
+      node_instances_active: [ 'all', 'partial']
     parameters:
       snapshot_name:
         description: >
@@ -877,6 +887,8 @@ workflows:
 
   restore:
     mapping: suspend.cloudify_suspend.workflows.restore
+    availability_rules:
+      node_instances_active: ['partial', 'none']
     parameters:
       snapshot_name:
         description: >
@@ -905,6 +917,8 @@ workflows:
 
   scaleuplist:
     mapping: scalelist.cloudify_scalelist.workflows.scaleuplist
+    availability_rules:
+      node_instances_active: [ 'all', 'partial']
     parameters:
       scalable_entity_properties:
         description: >
@@ -940,6 +954,8 @@ workflows:
 
   scaledownlist:
     mapping: scalelist.cloudify_scalelist.workflows.scaledownlist
+    availability_rules:
+      node_instances_active: [ 'all', 'partial']
     parameters:
       scale_compute:
         description: >
@@ -992,6 +1008,8 @@ workflows:
 
   update_operation_filtered:
     mapping: scalelist.cloudify_scalelist.workflows.execute_operation
+    availability_rules:
+      node_instances_active: [ 'all', 'partial']
     parameters:
       operation:
         type: string
@@ -1154,6 +1172,8 @@ workflows:
 
   alt_start:
     mapping: lifecycle_operations.cloudify_rollback_workflow.workflows.start
+    availability_rules:
+      node_instances_active: [ 'all', 'partial']
     parameters:
       operation_parms:
         default: { }
@@ -1172,6 +1192,8 @@ workflows:
 
   alt_stop:
     mapping: lifecycle_operations.cloudify_rollback_workflow.workflows.stop
+    availability_rules:
+      node_instances_active: [ 'all', 'partial']
     parameters:
       operation_parms:
         default: { }
@@ -1190,6 +1212,8 @@ workflows:
 
   alt_precreate:
     mapping: lifecycle_operations.cloudify_rollback_workflow.workflows.precreate
+    availability_rules:
+      node_instances_active: ['partial', 'none']
     parameters:
       operation_parms:
         default: { }
@@ -1208,6 +1232,8 @@ workflows:
 
   alt_create:
     mapping: lifecycle_operations.cloudify_rollback_workflow.workflows.create
+    availability_rules:
+      node_instances_active: ['partial', 'none']
     parameters:
       operation_parms:
         default: { }
@@ -1226,6 +1252,8 @@ workflows:
 
   alt_configure:
     mapping: lifecycle_operations.cloudify_rollback_workflow.workflows.configure
+    availability_rules:
+      node_instances_active: ['partial', 'none']
     parameters:
       operation_parms:
         default: { }
@@ -1244,6 +1272,8 @@ workflows:
 
   alt_poststart:
     mapping: lifecycle_operations.cloudify_rollback_workflow.workflows.poststart
+    availability_rules:
+      node_instances_active: [ 'all', 'partial']
     parameters:
       operation_parms:
         default: { }
@@ -1262,6 +1292,8 @@ workflows:
 
   alt_prestop:
     mapping: lifecycle_operations.cloudify_rollback_workflow.workflows.prestop
+    availability_rules:
+      node_instances_active: [ 'all', 'partial']
     parameters:
       operation_parms:
         default: { }
@@ -1280,6 +1312,8 @@ workflows:
 
   alt_delete:
     mapping: lifecycle_operations.cloudify_rollback_workflow.workflows.delete
+    availability_rules:
+      node_instances_active: [ 'all', 'partial']
     parameters:
       operation_parms:
         default: { }
@@ -1298,6 +1332,8 @@ workflows:
 
   alt_postdelete:
     mapping: lifecycle_operations.cloudify_rollback_workflow.workflows.postdelete
+    availability_rules:
+      node_instances_active: [ 'all', 'partial']
     parameters:
       operation_parms:
         default: { }
@@ -1316,6 +1352,8 @@ workflows:
 
   rollback_deprecated:
     mapping: lifecycle_operations.cloudify_rollback_workflow.workflows.rollback
+    availability_rules:
+      node_instances_active: [ 'all', 'partial']
     parameters:
       type_names:
         default: [ ]
@@ -1345,6 +1383,8 @@ workflows:
 
   batch_deploy_and_install:
     mapping: cloudify_custom_workflow.cloudify_custom_workflow.tasks.batch_deploy_and_install
+    availability_rules:
+      node_instances_active: ['none']
     parameters:
       blueprint_id:
         type: string
@@ -1375,6 +1415,8 @@ workflows:
 
   batch_deploy:
     mapping: cloudify_custom_workflow.cloudify_custom_workflow.tasks.batch_deploy
+    availability_rules:
+      node_instances_active: ['none']
     parameters:
       blueprint_id:
         type: string
@@ -1401,6 +1443,8 @@ workflows:
 
   batch_install:
     mapping: cloudify_custom_workflow.cloudify_custom_workflow.tasks.batch_install
+    availability_rules:
+      node_instances_active: ['none']
     parameters:
       group_id:
         type: string