x/vmware-nsx
Code Issues Proposed changes

Integrate with floating ips OVO

Browse Source 
Commit I543669ed3bd59a1f7d5b999e3113bcea7b3c52a8 broke the MH plugin
floating ips code

Change-Id: If1a33889e311dea9a4137748f0227cb5b58de86b
This commit is contained in:
Adit Sarfaty 2017-12-07 13:48:39 +02:00
parent 073e7512b2
commit 339f53f42c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vmware_nsx/plugins/nsx_mh/plugin.py
View File

@ -1912,7 +1912,8 @@ class NsxPluginV2(addr_pair_db.AllowedAddressPairsMixin,
_p, _s, old_internal_ip = self._internal_fip_assoc_data(
context, {'id': floatingip_db.id,
'port_id': floatingip_db.fixed_port_id,
'fixed_ip_address': floatingip_db.fixed_ip_address,
'fixed_ip_address':
str(floatingip_db.fixed_ip_address),
'tenant_id': floatingip_db.tenant_id},
floatingip_db.tenant_id)
nsx_gw_port_id = routerlib.find_router_gw_port(
@ -1977,11 +1978,10 @@ class NsxPluginV2(addr_pair_db.AllowedAddressPairsMixin,
raise nsx_exc.NsxPluginException(err_msg=msg)
# Update also floating ip status (no need to call base class method)
new_status = self._floatingip_status(floatingip_db, router_id)
floatingip_db.update(
{'fixed_ip_address': internal_ip,
'fixed_port_id': port_id,
'router_id': router_id,
'status': new_status})
floatingip_db.fixed_ip_address = internal_ip
floatingip_db.fixed_port_id = port_id
floatingip_db.router_id = router_id
floatingip_db.status = new_status
return {'fixed_ip_address': internal_ip,
'fixed_port_id': port_id,