Merge pull request #241 from cloudify-cosmo/floating-ip-fixes

another fix

Author: EarthmanT

CHANGELOG.txt

@@ -1,5 +1,6 @@
 2.9.0:
     - Add Support for backup/restore actions.
+    - Fix bug in server-port-floating-ip handling.
 2.8.2:
     - Add attach operation for server-port in order to support heal for server with floating ip.
 2.8.1:

blueprints/server-networks.yaml

@@ -2,7 +2,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.3.1/types.yaml
-  - http://www.getcloudify.org/spec/openstack-plugin/2.8.2/plugin.yaml
+  - ../plugin.yaml
 
 inputs:
 

cinder_plugin/tests/test_volume.py

@@ -480,12 +480,6 @@ def test_list_volumes(self, cinder_m):
             volume_ctx.instance.runtime_properties
         )
 
-    @mock.patch('openstack_plugin_common.CinderClientWithSugar')
-    def test_creation_validation(self, cinder_m):
-        volume_ctx, volume_id = self._simple_volume_ctx()
-
-        volume.creation_validation(ctx=volume_ctx)
-
     @mock.patch('openstack_plugin_common.CinderClientWithSugar')
     @mock.patch('time.sleep', mock.Mock())
     def test_delete_snapshot(self, cinder_m):

neutron_plugin/port.py

@@ -34,6 +34,7 @@
     set_neutron_runtime_properties,
     create_object_dict,
     COMMON_RUNTIME_PROPERTIES_KEYS,
+    OPENSTACK_ID_PROPERTY,
     is_external_relationship_not_conditionally_created)
 
 from neutron_plugin.network import NETWORK_OPENSTACK_TYPE
@@ -42,6 +43,7 @@
 from openstack_plugin_common.floatingip import get_server_floating_ip
 
 PORT_OPENSTACK_TYPE = 'port'
+PORT_ADDRESS_REL_TYPE = 'cloudify.openstack.port_connected_to_floating_ip'
 
 # Runtime properties
 FIXED_IP_ADDRESS_PROPERTY = 'fixed_ip_address'  # the fixed ip address
@@ -111,25 +113,34 @@ def attach(nova_client, neutron_client, **kwargs):
                         'external port and server are being used')
         return
 
-    port_id = get_openstack_id(ctx.target)
     server_id = get_openstack_id(ctx.source)
+    port_id = get_openstack_id(ctx.target)
     port = neutron_client.show_port(port_id)
+    server = nova_client.servers.get(server_id)
     network = neutron_client.show_network(port['port']['network_id'])
     network_name = network['network']['name']
-    server = nova_client.servers.get(server_id)
-    server_floating_ip = get_server_floating_ip(neutron_client, server_id)
-    floating_ip = server_floating_ip['floating_ip_address']
+
+    floating_ip_address = None
+    for target in ctx.target.instance.relationships:
+        if target.type == PORT_ADDRESS_REL_TYPE:
+            target_instance = target.target.instance
+            floatingip_id = \
+                target_instance.runtime_properties[OPENSTACK_ID_PROPERTY]
+            floating_ip = neutron_client.show_floatingip(floatingip_id)
+            floating_ip_address = \
+                floating_ip['floatingip']['floating_ip_address']
+
     server_addresses = \
         [addr['addr'] for addr in server.addresses[network_name]]
 
-    if server_floating_ip and floating_ip not in server_addresses:
-        ctx.logger.info('We will attach floating ip {0} to server'
-                        .format(server_floating_ip['floating_ip_address']))
-        server.add_floating_ip(server_floating_ip['floating_ip_address'])
+    if floating_ip_address and floating_ip_address not in server_addresses:
+        ctx.logger.info('We will attach floating ip {0} to server {1}'
+                        .format(floating_ip_address, server_id))
+        server.add_floating_ip(floating_ip_address)
         return ctx.operation.retry(
             message='Waiting for the floating ip {0} to '
                     'attach to server {1}..'
-                    .format(server_floating_ip['floating_ip_address'],
+                    .format(floating_ip_address,
                             server_id),
             retry_after=10)
     change = {