x/vmware-nsx
Code Issues Proposed changes

Update code to match recent neutron changes

Browse Source 
NSX|V3: fix call to _confirm_router_interface_not_in_use
Commit Iea58177cce30d7ce6ba7b36ce5f8375c0985179e changed the api

NSX|V: Fix _make_port_dict api
Commit Ic08e4049f6156c0700ca3c7aee251b6eb0eb97da added bulk argument
to this api.

Change-Id: I6bbe34cfedf731f0711fee45800d9f78247bc6ba
This commit is contained in:
asarfaty 2021-01-17 08:44:08 +02:00
parent b5af694793
commit 132f006574
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vmware_nsx/plugins/nsx_v/plugin.py
View File

@ -2211,10 +2211,10 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
return port_data
def _make_port_dict(self, port, fields=None,
process_extensions=True):
process_extensions=True, bulk=False):
port_data = super(NsxVPluginV2, self)._make_port_dict(
port, fields=fields,
process_extensions=process_extensions)
process_extensions=process_extensions, bulk=bulk)
self._remove_provider_security_groups_from_list(port_data)
return port_data

9
vmware_nsx/plugins/nsx_v3/plugin.py
View File

@ -2624,19 +2624,22 @@ class NsxV3Plugin(nsx_plugin_common.NsxPluginV3Base,
if port.get('fixed_ips'):
for fip in port['fixed_ips']:
subnet_id = fip['subnet_id']
subnet_obj = self._get_subnet_object(context, subnet_id)
subnet = self._make_subnet_dict(subnet_obj, fields=None,
context=context)
self._confirm_router_interface_not_in_use(
context, router_id, subnet_id)
context, router_id, subnet)
if not (port['device_owner'] in const.ROUTER_INTERFACE_OWNERS and
port['device_id'] == router_id):
raise l3_exc.RouterInterfaceNotFound(
router_id=router_id, port_id=port_id)
elif 'subnet_id' in interface_info:
subnet_id = interface_info['subnet_id']
self._confirm_router_interface_not_in_use(
context, router_id, subnet_id)
subnet_obj = self._get_subnet_object(context, subnet_id)
subnet = self._make_subnet_dict(subnet_obj, fields=None,
context=context)
self._confirm_router_interface_not_in_use(
context, router_id, subnet)
network_id = subnet['network_id']
ports = self._get_router_interface_ports_by_network(
context, router_id, network_id)