Browse Source

NSX|P Fix router interface removal

And enable the CI test that was blocked with this issue

Depends-on: Ib0ab3baacc65437aa1d822a133bdec2ebf566bd5
Change-Id: I96c6eee726c7da3fa63b7c0da6141a1285581c12
changes/59/625559/7
Adit Sarfaty 3 years ago
parent
commit
8374f93bbc
  1. 3
      devstack/nsx_p/devstackgaterc
  2. 9
      vmware_nsx/plugins/nsx_p/plugin.py

3
devstack/nsx_p/devstackgaterc

@ -39,9 +39,6 @@ r="$r|(?:tempest\.api\.network\.admin\.test_external_network_extension\.External
# Some ICMP types are not supported by the NSX backend
r="$r|(?:tempest\.api\.network\.test_security_groups\.SecGroupTest\.test_create_security_group_rule_with_icmp_type_code.*)"
# TODO(asarfaty): Make this test pass
r="$r|(?:tempest\.api\.network\.test_routers_negative\.RoutersNegativeTest\.test_router_remove_interface_in_use_returns_409.*)"
# End list of exclusions.
r="$r)"

9
vmware_nsx/plugins/nsx_p/plugin.py

@ -1233,15 +1233,8 @@ class NsxPolicyPlugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
# Remove the tier1 router from this segment on the nSX
try:
#TODO(asarfaty): adding the segment name even though it was not
# changed because otherwise the NSX will set it to default.
# This code should be removed once NSX supports it.
net = self._get_network(context, network_id)
net_name = utils.get_name_and_uuid(
net['name'] or 'network', network_id)
segment_id = self._get_network_nsx_segment_id(context, network_id)
self.nsxpolicy.segment.update(segment_id, name=net_name,
tier1_id=None)
self.nsxpolicy.segment.remove_connectivity_and_subnets(segment_id)
# try to delete the SNAT/NO_DNAT rules of this subnet
router_db = self._get_router(context, router_id)

Loading…
Cancel
Save