make some corrections in handling of fixed ips

Author: earthmant

CHANGELOG.txt

@@ -1,5 +1,5 @@
 2.9.1:
-    - Fix a bug introduced in 2.7.6 when setting fixed ip via args.
+    - Fix a bug introduced in 2.7.6 when setting fixed_ip via args.
     - Update CircleCI v2.
 2.9.0:
     - Add Support for backup/restore actions.

blueprints/port-fixed-ip.yaml

@@ -53,6 +53,15 @@ node_templates:
         target: private_subnet
       - type: cloudify.openstack.port_connected_to_security_group
         target: security_group
+    # interfaces:
+    #   cloudify.interfaces.lifecycle:
+    #     create:
+    #       inputs:
+    #         args:
+    #           name: os_port
+    #           fixed_ips:
+    #           - ip_address: { get_input: fixed_ip }
+    #             subnet_id: { get_attribute: [ private_subnet, external_id ] }
 
   security_group:
     type: cloudify.openstack.nodes.SecurityGroup

neutron_plugin/port.py

@@ -286,8 +286,19 @@ def _handle_fixed_ips(port):
     if subnet_id:
         fixed_ips_element['subnet_id'] = subnet_id
 
+    if 'fixed_ips' not in port and not fixed_ips_element:
+        return
+
+    elif 'fixed_ips' not in port and fixed_ips_element:
+        port['fixed_ips'] = [fixed_ips_element]
+
+    addresses = [ip.get('ip_address') for ip in port['fixed_ips']]
+    subnets = [net.get('subnet_id') for net in port['fixed_ips']]
+
     # applying fixed ip parameter, if available
-    if fixed_ips_element:
+    if fixed_ips_element and not \
+            (fixed_ips_element.get('ip_address') in addresses or
+             fixed_ips_element.get('subnet_id') in subnets):
         port['fixed_ips'] = [fixed_ips_element]