From 37189501c99bbe5972e8d1bf22e06ef0fc5b2ae4 Mon Sep 17 00:00:00 2001 From: Babu Shanmugam Date: Fri, 14 Aug 2015 12:00:12 +0000 Subject: [PATCH] Fixing port-list with fixed-ip filtering Change-Id: Ibf2f06441a9bcaa36d7f5ef8c38485029cf4c34e Closes-bug: #1484912 --- .../plugins/opencontrail/vnc_client/vmi_res_handler.py | 8 ++++++-- 1 file changed, 6 insertions(+), 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 index 3c5b215..b205eee 100644 --- 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