Merge pull request #201 from cloudify-cosmo/issue-195

Fixes #195

Author: EarthmanT

neutron_plugin/floatingip.py

@@ -22,16 +22,26 @@
     get_openstack_id,
     add_list_to_runtime_properties,
     is_external_relationship,
-    is_external_relationship_not_conditionally_created
+    is_external_relationship_not_conditionally_created,
+    get_single_connected_node_by_openstack_type,
+    OPENSTACK_ID_PROPERTY
 )
 from openstack_plugin_common.floatingip import (
     use_external_floatingip,
     set_floatingip_runtime_properties,
     delete_floatingip,
     floatingip_creation_validation
 )
+from network import NETWORK_OPENSTACK_TYPE
 
 FLOATINGIP_OPENSTACK_TYPE = 'floatingip'
+FLOATING_NETWORK_ERROR_PREFIX = \
+    'Network name must be specified by either a floating_network_name, a ' \
+    'floating_network_id, or a relationship to a Network node template '
+FLOATING_NETWORK_ERROR_SUFFIX = \
+    '(provided: network from relationships={}, floatingip={})'
+FLOATING_NETWORK_ERROR_MSG = FLOATING_NETWORK_ERROR_PREFIX +\
+                             FLOATING_NETWORK_ERROR_SUFFIX
 
 
 @operation
@@ -47,19 +57,46 @@ def create(neutron_client, args, **kwargs):
     }
     floatingip.update(ctx.node.properties[FLOATINGIP_OPENSTACK_TYPE], **args)
 
-    # Sugar: floating_network_name -> (resolve) -> floating_network_id
-    if 'floating_network_name' in floatingip:
+    # Do we have a relationship with a network?
+
+    connected_network = \
+        get_single_connected_node_by_openstack_type(
+            ctx, NETWORK_OPENSTACK_TYPE, True)
+
+    if connected_network:
+        network_from_rel = connected_network.runtime_properties[
+            OPENSTACK_ID_PROPERTY]
+    else:
+        network_from_rel = None
+
+    # TODO: Should we check whether this is really an "external" network?
+
+    network_name_provided = 'floating_network_name' in floatingip
+    network_id_provided = 'floating_network_id' in floatingip
+    provided = [network_name_provided,
+                network_id_provided,
+                network_from_rel is not None].count(True)
+
+    # At most one is expected.
+
+    if provided > 1:
+        raise NonRecoverableError(FLOATING_NETWORK_ERROR_MSG.format(
+            network_from_rel, floatingip))
+
+    if network_from_rel:
+        floatingip['floating_network_id'] = network_from_rel
+    elif network_name_provided:
         floatingip['floating_network_id'] = neutron_client.cosmo_get_named(
             'network', floatingip['floating_network_name'])['id']
         del floatingip['floating_network_name']
-    elif 'floating_network_id' not in floatingip:
+    elif not network_id_provided:
         provider_context = provider(ctx)
         ext_network = provider_context.ext_network
         if ext_network:
             floatingip['floating_network_id'] = ext_network['id']
         else:
-            raise NonRecoverableError(
-                'Missing floating network id, name or external network')
+            raise NonRecoverableError(FLOATING_NETWORK_ERROR_MSG.format(
+                None, None))
 
     fip = neutron_client.create_floatingip(
         {FLOATINGIP_OPENSTACK_TYPE: floatingip})[FLOATINGIP_OPENSTACK_TYPE]

neutron_plugin/tests/resources/test_fip_rel.yaml

@@ -0,0 +1,27 @@
+tosca_definitions_version: cloudify_dsl_1_3
+
+imports:
+  - http://www.getcloudify.org/spec/cloudify/4.2/types.yaml
+  - plugin.yaml
+
+dsl_definitions:
+  - &openstack_config
+    username: aaa
+    password: aaa
+    tenant_name: aaa
+    auth_url: aaa
+
+node_templates:
+  network:
+    type: cloudify.openstack.nodes.Network
+    properties:
+      resource_id: abcdef
+      openstack_config: *openstack_config
+
+  fip:
+    type: cloudify.openstack.nodes.FloatingIP
+    properties:
+      openstack_config: *openstack_config
+    relationships:
+      - target: network
+        type: cloudify.relationships.connected_to

neutron_plugin/tests/resources/test_fip_rel_and_id.yaml

@@ -0,0 +1,29 @@
+tosca_definitions_version: cloudify_dsl_1_3
+
+imports:
+  - http://www.getcloudify.org/spec/cloudify/4.2/types.yaml
+  - plugin.yaml
+
+dsl_definitions:
+  - &openstack_config
+    username: aaa
+    password: aaa
+    tenant_name: aaa
+    auth_url: aaa
+
+node_templates:
+  network:
+    type: cloudify.openstack.nodes.Network
+    properties:
+      resource_id: abcdef
+      openstack_config: *openstack_config
+
+  fip:
+    type: cloudify.openstack.nodes.FloatingIP
+    properties:
+      openstack_config: *openstack_config
+      floatingip:
+        floating_network_id: 'bogus-id'
+    relationships:
+      - target: network
+        type: cloudify.relationships.connected_to

neutron_plugin/tests/test_floating_ip.py

@@ -0,0 +1,55 @@
+import os
+import unittest
+import mock
+
+from cloudify.test_utils import workflow_test
+from cloudify.mocks import MockNodeInstanceContext
+
+from neutron_plugin.floatingip import (
+    FLOATINGIP_OPENSTACK_TYPE, FLOATING_NETWORK_ERROR_PREFIX)
+from openstack_plugin_common import OPENSTACK_ID_PROPERTY
+
+
+class FloatingIPTest(unittest.TestCase):
+    @mock.patch('neutron_plugin.network.create')
+    @mock.patch('neutronclient.v2_0.client.Client.create_floatingip')
+    @workflow_test(os.path.join('resources', 'test_fip_rel.yaml'),
+                   copy_plugin_yaml=True)
+    def test_network_rel(self, cfy_local, *_):
+        def _mock_rel(*_):
+            return MockNodeInstanceContext(runtime_properties={
+                OPENSTACK_ID_PROPERTY: 'my-id'
+            })
+
+        def _mock_create(_, fip):
+            self.assertEqual(fip[FLOATINGIP_OPENSTACK_TYPE][
+                                 'floating_network_id'], 'my-id')
+            return {FLOATINGIP_OPENSTACK_TYPE: {
+                'id': '1234',
+                'floating_ip_address': '1.2.3.4'
+            }}
+
+        with mock.patch('neutronclient.v2_0.client.Client.create_floatingip',
+                        new=_mock_create):
+            with mock.patch(
+                    'neutron_plugin.floatingip.get_single_connected_node_by_'
+                    'openstack_type', new=_mock_rel):
+                cfy_local.execute('install')
+
+    @mock.patch('neutron_plugin.network.create')
+    @mock.patch('neutronclient.v2_0.client.Client.create_floatingip')
+    @workflow_test(os.path.join('resources', 'test_fip_rel_and_id.yaml'),
+                   copy_plugin_yaml=True)
+    def test_network_rel_and_id(self, cfy_local, *_):
+        def _mock_rel(*_):
+            return MockNodeInstanceContext(runtime_properties={
+                OPENSTACK_ID_PROPERTY: 'my-id'
+            })
+
+        with mock.patch('neutron_plugin.floatingip.get_single_connected_node_'
+                        'by_openstack_type',
+                        new=_mock_rel):
+            with self.assertRaises(Exception) as ex:
+                cfy_local.execute('install')
+
+            self.assertTrue(FLOATING_NETWORK_ERROR_PREFIX in str(ex.exception))