VMI update with fixed-ips is returning incorrect result

Closes-bug: #1484907 Change-Id: I205c1e49567f8b7f1890a584b52ea61105550878
Juniper · Aug 14, 2015 · 865c7ca · 865c7ca
1 parent 7e7a7ce
commit 865c7ca
Showing 1 changed file with 4 additions and 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
@@ -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)