Flavor access and flavor extra-specs support added

Author: Krzysztof Bijakowski

blueprints/flavor.yaml

@@ -0,0 +1,56 @@
+tosca_definitions_version: cloudify_dsl_1_3
+
+imports:
+  - http://www.getcloudify.org/spec/cloudify/4.2/types.yaml
+  - http://www.getcloudify.org/spec/openstack-plugin/2.9.9/plugin.yaml
+
+inputs:
+  keystone_username:
+    default: { get_secret: keystone_username }
+
+  keystone_password:
+    default: { get_secret: keystone_password }
+
+  keystone_tenant_name:
+    default: { get_secret: keystone_tenant_name }
+
+  keystone_url:
+    default: { get_secret: keystone_url }
+
+  region:
+    default: { get_secret: region }
+
+  flavor:
+    default:
+      vcpus: 4
+      ram: 4096
+      disk: 40
+      swap: 0
+      ephemeral: 0
+      is_public: false
+
+  flavor_extra_spec:
+    default:
+      "hw:cpu_policy": 'dedicated'
+      "hw:cpu_threads_policy": 'isolate'
+
+  flavor_tenants:
+    default: ['cfy_test_project']
+
+dsl_definitions:
+  openstack_config: &openstack_config
+    username: { get_input: keystone_username }
+    password: { get_input: keystone_password }
+    tenant_name: { get_input: keystone_tenant_name }
+    auth_url: { get_input: keystone_url }
+    region: { get_input: region }
+
+node_templates:
+  test_flavor:
+    type: cloudify.openstack.nodes.Flavor
+    properties:
+      flavor: { get_input: flavor }
+      extra_specs: { get_input: flavor_extra_spec }
+      tenants: { get_input: flavor_tenants }
+      resource_id: 'cfy_test_flavor'
+      openstack_config: *openstack_config

nova_plugin/flavor.py

@@ -16,35 +16,79 @@
 from cloudify import ctx
 from cloudify.decorators import operation
 
-from openstack_plugin_common import (with_nova_client,
-                                     use_external_resource,
-                                     delete_resource_and_runtime_properties,
-                                     create_object_dict,
-                                     add_list_to_runtime_properties,
-                                     set_openstack_runtime_properties,
-                                     COMMON_RUNTIME_PROPERTIES_KEYS)
+from openstack_plugin_common import (
+    with_nova_client,
+    use_external_resource,
+    delete_runtime_properties,
+    delete_resource_and_runtime_properties,
+    create_object_dict,
+    add_list_to_runtime_properties,
+    set_openstack_runtime_properties,
+    COMMON_RUNTIME_PROPERTIES_KEYS
+)
 
 FLAVOR_OPENSTACK_TYPE = 'flavor'
 
+EXTRA_SPECS_PROPERTY = 'extra_specs'
+
+TENANTS_PROPERTY = 'tenants'
+
 RUNTIME_PROPERTIES_KEYS = COMMON_RUNTIME_PROPERTIES_KEYS
 
 
+def _set_extra_specs(ctx, flavor):
+    extra_specs = ctx.node.properties.get(EXTRA_SPECS_PROPERTY, {})
+
+    if extra_specs:
+        ctx.logger.info(
+            'Setting extra specs: {0} for flavor: {1}'
+            .format(extra_specs, flavor.to_dict())
+        )
+
+        flavor.set_keys(extra_specs)
+
+    ctx.instance.runtime_properties[EXTRA_SPECS_PROPERTY] = extra_specs
+
+
+def _set_tenants_access(ctx, nova_client, flavor):
+    tenants = ctx.node.properties.get(TENANTS_PROPERTY, [])
+
+    for tenant in tenants:
+        ctx.logger.info(
+            'Adding tenant access: {0} for flavor: {1}'
+            .format(tenant, flavor.to_dict())
+        )
+        nova_client.flavor_access.add_tenant_access(flavor, tenant)
+
+    ctx.instance.runtime_properties[TENANTS_PROPERTY] = tenants
+
+
 @operation
 @with_nova_client
 def create(nova_client, args, **kwargs):
     if use_external_resource(ctx, nova_client, FLAVOR_OPENSTACK_TYPE):
         return
 
     flavor_dict = create_object_dict(ctx, FLAVOR_OPENSTACK_TYPE, args, {})
+    ctx.logger.info('Creating flavor: {0}'.format(flavor_dict))
+
     flavor = nova_client.flavors.create(**flavor_dict)
     set_openstack_runtime_properties(ctx, flavor, FLAVOR_OPENSTACK_TYPE)
 
+    _set_extra_specs(ctx, flavor)
+    _set_tenants_access(ctx, nova_client, flavor)
+
 
 @operation
 @with_nova_client
 def delete(nova_client, **kwargs):
-    delete_resource_and_runtime_properties(ctx, nova_client,
-                                           RUNTIME_PROPERTIES_KEYS)
+    delete_resource_and_runtime_properties(
+        ctx,
+        nova_client,
+        RUNTIME_PROPERTIES_KEYS
+    )
+
+    delete_runtime_properties(ctx, [EXTRA_SPECS_PROPERTY, TENANTS_PROPERTY])
 
 
 @with_nova_client