From 865c7ca6672a865b505d7f6592543241d1bd5d6a Mon Sep 17 00:00:00 2001 From: Babu Shanmugam Date: Fri, 14 Aug 2015 11:37:57 +0000 Subject: [PATCH] VMI update with fixed-ips is returning incorrect result Closes-bug: #1484907 Change-Id: I205c1e49567f8b7f1890a584b52ea61105550878 --- .../plugins/opencontrail/vnc_client/vmi_res_handler.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 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..6d7ba15 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 @@ -733,11 +733,11 @@ def resource_update(self, context, port_id, port_q): vmi_obj = self._neutron_port_to_vmi(port_q, vmi_obj=vmi_obj, update=True) - self._resource_update(vmi_obj) if 'fixed_ips' in port_q: - self._create_instance_ips(vn_obj, vmi_obj, - port_q.get('fixed_ips')) - vn_obj = self._resource_get(id=port_id) + self._create_instance_ips(vn_obj, vmi_obj, port_q['fixed_ips']) + + self._resource_update(vmi_obj) + vmi_obj = self._resource_get(id=port_id) ret_port_q = self._vmi_to_neutron_port( vmi_obj, extensions_enabled=contrail_extensions_enabled)