Merge "Fixing port-list with fixed-ip filtering"

Juniper · Aug 22, 2015 · aad0604 · aad0604
2 parents b2ffb87 + 3718950
commit aad0604
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/neutron_plugin_contrail/plugins/opencontrail/vnc_client/vmi_res_handler.py b/neutron_plugin_contrail/plugins/opencontrail/vnc_client/vmi_res_handler.py
@@ -39,8 +39,12 @@ def _port_fixed_ips_is_present(check, against):
         # against = [{'subnet_id': 'uuid', 'ip_address': u'20.0.0.5'}]
 
         for item in against:
-            if item['ip_address'] in check['ip_address'] and (
-                    item['subnet_id'] in check['subnet_id']):
+            result = True
+            for k in item.keys():
+                if k in check and item[k] not in check[k]:
+                    result = False
+
+            if result:
                 return True
 
         return False