changes requested in PR

cloudify-cosmo · Mar 24, 2019 · a8b6c28 · a8b6c28
1 parent 846155f
commit a8b6c28
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/.cicd/resource_interface_mappings.py b/.cicd/resource_interface_mappings.py
@@ -18,6 +18,11 @@
 
 class InterfaceBase(object):
 
+    type_name = None
+    client_name = None
+    get_method_name = None
+    delete_method_name = None
+
     def __init__(self, resource_id, client_config):
         self.id = resource_id
         self.client_config = client_config
@@ -103,6 +108,6 @@ class Server(InterfaceBase):
 class FloatingIP(InterfaceBase):
 
     type_name = 'cloudify.nodes.openstack.FloatingIP'
-    client_name = 'compute'
+    client_name = 'network'
     get_method_name = 'get_ip'
     delete_method_name = 'delete_ip'
diff --git a/.cicd/test_manager.py b/.cicd/test_manager.py
@@ -44,7 +44,9 @@ def check_main_blueprint(self):
         self.inputs = dict(self.client_config)
         self.inputs.update(
             {
-                'external_network_id': 'dda079ce-12cf-4309-879a-8e67aec94de4',
+                'external_network_id': os.getenv(
+                    'external_network_id',
+                    'dda079ce-12cf-4309-879a-8e67aec94de4'),
                 'example_subnet_cidr': '10.10.0.0/24',
                 'name_prefix': 'blueprint_',
                 'image_id': 'e41430f7-9131-495b-927f-e7dc4b8994c8',

diff --git a/examples/README.md b/examples/README.md
@@ -2,6 +2,6 @@
 
 These blueprints are used primarily for testing use cases.
 
-The local blueprints are using for testing in a special environment. They have several syntactical peculiarities that make them not good examples for basing your work off of.
+The local blueprints are using for testing in a special environment. They have several syntactical peculiarities and are not therefore representative of best practices.
 
 The manager blueprints are good for learning best practices.
diff --git a/examples/local/port_fixed_ip.yaml b/examples/local/port_fixed_ip.yaml
@@ -109,4 +109,4 @@ node_templates:
       client_config: *client_config
       use_external_resource: true
       resource_config:
-        id: { get_input: network_id }
+        id: { get_input: network_id }
diff --git a/examples/local/project.yaml b/examples/local/project.yaml
@@ -50,4 +50,4 @@ node_templates:
           roles:
             - test_role_1
             - test_role_2
-            - test_role_3
+            - test_role_3