Merge branch 'master' into CY-2432-Keystone-v3-Validation

Author: EarthmanT

CHANGELOG.txt

@@ -1,5 +1,6 @@
 3.2.11:
   - Keystone V3 validation to refer to docs URL in case of missing configuration.
+  - Add public_ip property when using server_connected_to_floating_ip and if use_public_ip is set True.
 3.2.10:
   - Remove ID key from resource object if healing terminated VM.
 3.2.9

openstack_plugin/constants.py

@@ -152,6 +152,8 @@
                                 CLOUDIFY_STOP_OPERATION,
                                 CLOUDIFY_DELETE_OPERATION,
                                 CLOUDIFY_CREATE_VALIDATION]
+SERVER_PUBLIC_IP_PROPERTY = 'public_ip'
+SERVER_IP_PROPERTY = 'ip'
 
 KEY_USE_CFY_LOGGER = 'use_cfy_logger'
 KEY_GROUPS = 'groups'

openstack_plugin/resources/compute/server.py

@@ -84,7 +84,9 @@
                                         OPENSTACK_PORT_ID,
                                         OPENSTACK_NETWORK_ID,
                                         OPENSTACK_TYPE_PROPERTY,
-                                        USE_EXTERNAL_RESOURCE_PROPERTY)
+                                        USE_EXTERNAL_RESOURCE_PROPERTY,
+                                        SERVER_PUBLIC_IP_PROPERTY,
+                                        SERVER_IP_PROPERTY)
 
 from openstack_plugin.utils import \
     (handle_userdata,
@@ -209,8 +211,8 @@ def _set_server_ips_runtime_properties(server):
 
         # Only set the first "ip" as runtime property
         if ipv4['type'] == 'fixed'\
-                and 'ip' not in ctx.instance.runtime_properties:
-            ctx.instance.runtime_properties['ip'] = ip
+                and SERVER_IP_PROPERTY not in ctx.instance.runtime_properties:
+            ctx.instance.runtime_properties[SERVER_IP_PROPERTY] = ip
 
         # Only set the first "public_ip_address" as runtime property
         elif ipv4['type'] == 'floating'\
@@ -226,8 +228,8 @@ def _set_server_ips_runtime_properties(server):
             ctx.instance.runtime_properties['ipv6'] = ip_v6
             # If "ip" is not set at this point, then the only address used
             # is ipv6
-            if 'ip' not in ctx.instance.runtime_properties:
-                ctx.instance.runtime_properties['ip'] = ip_v6
+            if SERVER_IP_PROPERTY not in ctx.instance.runtime_properties:
+                ctx.instance.runtime_properties[SERVER_IP_PROPERTY] = ip_v6
 
         # Only set the first "public_ip6_address" as runtime property
         elif ipv6['type'] == 'floating'\
@@ -240,11 +242,12 @@ def _set_server_ips_runtime_properties(server):
     if ctx.node.properties.get('use_public_ip'):
         pip = ctx.instance.runtime_properties.get('public_ip_address')
         if pip:
-            ctx.instance.runtime_properties['ip'] = pip
+            ctx.instance.runtime_properties[SERVER_IP_PROPERTY] = pip
+            ctx.instance.runtime_properties[SERVER_PUBLIC_IP_PROPERTY] = pip
 
     elif ctx.node.properties.get('use_ipv6_ip', False) and ipv6_addresses:
         ip_v6 = ctx.instance.runtime_properties['ipv6']
-        ctx.instance.runtime_properties['ip'] = ip_v6
+        ctx.instance.runtime_properties[SERVER_IP_PROPERTY] = ip_v6
 
     # Get list of all ipv4 associated with server
     ipv4_list = map(lambda ipv4_conf: ipv4_conf['addr'], ipv4_addresses)
@@ -2003,6 +2006,14 @@ def connect_floating_ip(openstack_resource, floating_ip, fixed_ip=''):
     fixed_ip = fixed_ip or None
     openstack_resource.add_floating_ip_to_server(floating_ip,
                                                  fixed_ip=fixed_ip)
+    # set public ip property inside server runtime_properties
+    ctx.source.instance.runtime_properties[SERVER_PUBLIC_IP_PROPERTY] = \
+        floating_ip
+    if ctx.source.node.properties.get('use_public_ip', False):
+        ctx.source.instance.runtime_properties['last_ip'] = \
+            ctx.source.instance.runtime_properties.get(SERVER_IP_PROPERTY)
+        ctx.source.instance.runtime_properties[SERVER_IP_PROPERTY] = \
+            floating_ip
 
 
 @with_compat_node
@@ -2022,6 +2033,11 @@ def disconnect_floating_ip(openstack_resource, floating_ip):
                                   ''.format(openstack_resource.resource_id))
 
     openstack_resource.remove_floating_ip_from_server(floating_ip)
+    # remove public ip property from server runtime_properties
+    ctx.source.instance.runtime_properties.pop(SERVER_PUBLIC_IP_PROPERTY, None)
+    if ctx.source.node.properties.get('use_public_ip', False):
+        ctx.source.instance.runtime_properties[SERVER_IP_PROPERTY] = \
+            ctx.source.instance.runtime_properties.pop('last_ip', None)
 
 
 @with_compat_node

openstack_plugin/tests/compute/test_server.py

@@ -66,7 +66,9 @@
                                         VOLUME_DETACHMENT_TASK,
                                         VOLUME_ATTACHMENT_ID,
                                         SERVER_ACTION_STATUS_DONE,
-                                        SERVER_ACTION_STATUS_PENDING)
+                                        SERVER_ACTION_STATUS_PENDING,
+                                        SERVER_PUBLIC_IP_PROPERTY,
+                                        SERVER_IP_PROPERTY)
 
 
 class CustomMockContext(MockContext):
@@ -656,8 +658,9 @@ def test_create_external_resource(self,
             '10.1.0.1',
             self._ctx.instance.runtime_properties['access_ipv4'])
 
-        self.assertTrue(self._ctx.instance.runtime_properties['ip'],
-                        '10.1.0.1')
+        self.assertTrue(
+            self._ctx.instance.runtime_properties[SERVER_IP_PROPERTY],
+            '10.1.0.1')
 
         self.assertEqual(
             3,
@@ -1946,6 +1949,7 @@ def test_disconnect_floating_ip(self, mock_connection):
                     RESOURCE_ID: 'a95b5509-c122-4c2f-823e-884bb559afe8',
                     OPENSTACK_TYPE_PROPERTY: SERVER_OPENSTACK_TYPE,
                     OPENSTACK_NAME_PROPERTY: 'node-server',
+                    SERVER_PUBLIC_IP_PROPERTY: '10.2.3.4',
                 }),
             'node': MockNodeContext(
                 id='1',
@@ -2018,6 +2022,7 @@ def test_disconnect_external_floating_ip(self, mock_connection):
                     RESOURCE_ID: 'a95b5509-c122-4c2f-823e-884bb559afe8',
                     OPENSTACK_TYPE_PROPERTY: SERVER_OPENSTACK_TYPE,
                     OPENSTACK_NAME_PROPERTY: 'node-server',
+                    SERVER_PUBLIC_IP_PROPERTY: '10.2.3.4',
                 }),
             'node': MockNodeContext(
                 id='1',
@@ -2043,7 +2048,6 @@ def test_disconnect_external_floating_ip(self, mock_connection):
             'availability_zone': 'test_availability_zone',
             'key_name': 'test_key_name',
             'status': 'ACTIVE',
-
         })
 
         # Mock find server operation