CY-802 Clean and format resources

cloudify-cosmo · Mar 22, 2019 · f3551db · f3551db
1 parent ad3d4a7
commit f3551db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/openstack_plugin/constants.py b/openstack_plugin/constants.py
@@ -134,8 +134,10 @@
 CLOUDIFY_START_OPERATION = 'cloudify.interfaces.lifecycle.start'
 CLOUDIFY_STOP_OPERATION = 'cloudify.interfaces.lifecycle.stop'
 CLOUDIFY_DELETE_OPERATION = 'cloudify.interfaces.lifecycle.delete'
+CLOUDIFY_CREATE_VALIDATION = 'cloudify.interfaces.validation.creation'
 CLOUDIFY_NEW_NODE_OPERATIONS = [CLOUDIFY_CREATE_OPERATION,
                                 CLOUDIFY_CONFIGURE_OPERATION,
                                 CLOUDIFY_START_OPERATION,
                                 CLOUDIFY_STOP_OPERATION,
-                                CLOUDIFY_DELETE_OPERATION]
+                                CLOUDIFY_DELETE_OPERATION,
+                                CLOUDIFY_CREATE_VALIDATION]
diff --git a/openstack_plugin/resources/network/rbac_policy.py b/openstack_plugin/resources/network/rbac_policy.py
@@ -332,7 +332,7 @@ def find_and_delete(openstack_resource,
     # to remove it from the config since this operation main job is to find
     # rbac policy based on the configuration provided by operation task and
     # then remove it
-    rbac_policy_config.pop('id')
+    rbac_policy_config.pop('id', None)
     rbac_policies = openstack_resource.list()
 
     for rbac_policy in rbac_policies:

diff --git a/plugin.yaml b/plugin.yaml
@@ -273,7 +273,6 @@ data_types:
         type: string
         required: false
 
-
   cloudify.types.openstack.RBACPolicy:
     properties:
       <<: *data_type_id
@@ -295,10 +294,7 @@ data_types:
         required: false
       action:
         description: >
-          The maximum port number in the range that is matched
-          by the security group rule. If the protocol is TCP, UDP, DCCP, SCTP or UDP-Lite
-          this value must be greater than or equal to the port_range_min attribute value.
-          If the protocol is ICMP, this value must be an ICMP type.
+          Action for the RBAC policy which is access_as_external or access_as_shared.
         type: string
         required: false
 
@@ -639,7 +635,6 @@ node_types:
             query:
               default: {}
 
-
   cloudify.nodes.openstack.Subnet:
     derived_from: cloudify.nodes.openstack.NetworkBase
     properties:
@@ -970,6 +965,7 @@ node_types:
           updates the defaults for the agent_config for Windows)
 
 
+
   cloudify.nodes.openstack.ServerGroup:
     derived_from: cloudify.nodes.Root
     properties:
@@ -1129,7 +1125,6 @@ node_types:
             details:
               default: True
 
-
   cloudify.nodes.openstack.User:
     derived_from: cloudify.nodes.Root
     properties: