openstack/neutron-fwaas-dashboard
Code Issues Proposed changes

Fix remove port dialog for ha_router_replicated_interface

Browse Source 
When using HA router ports, the remove port option causes a 500
error due to an IndexError. The filtering of a tenant's ports
needs to include those owned by HA routers.

Change-Id: I244e5829bb4e36092417e32e08be63b1192781f9
This commit is contained in:
Andrew Bonney 2024-12-05 13:24:39 +00:00
parent 284953b0a8
commit ce2039ef59
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron_fwaas_dashboard/api/fwaas_v2.py
View File

@ -126,7 +126,9 @@ def fwg_port_list_for_tenant(request, tenant_id, **kwargs):
def _is_target(port):
return (port['device_owner'].startswith('compute:') or
port['device_owner'].startswith('network:router_interface'))
port['device_owner'].startswith('network:router_interface') or
port['device_owner'].startswith(
'network:ha_router_replicated_interface'))
@profiler.trace

18
neutron_fwaas_dashboard/test/api_tests/test_fwaas_v2.py
View File

@ -605,12 +605,18 @@ class FwaasV2ApiTests(test.APITestCase):
'name': 'port-4',
'device_owner': 'network:dhcp'
}
ha_router_port = {
'id': 'id-5',
'name': 'port-5',
'device_owner': 'network:ha_router_replicated_interface'
}
dummy_ports = {'ports': [
router_port,
vm_port1,
vm_port2,
gateway_port,
dhcp_port,
ha_router_port
]}
self.mock_list_ports.return_value = dummy_ports
@ -621,6 +627,8 @@ class FwaasV2ApiTests(test.APITestCase):
self.assertEqual(router_port['id'], ports[0]['id'])
self.assertEqual(vm_port1['id'], ports[1]['id'])
self.assertEqual(vm_port2['id'], ports[2]['id'])
self.assertEqual(ha_router_port['id'], ports[3]['id'])
self.assertEqual(4, len(ports))
self.mock_list_ports.assert_called_once_with(tenant_id=tenant_id)
self.mock_list_fwaas_firewall_groups.assert_called_once_with(
@ -650,20 +658,28 @@ class FwaasV2ApiTests(test.APITestCase):
'name': 'port-4',
'device_owner': 'network:dhcp'
}
ha_router_port = {
'id': 'id-5',
'name': 'port-5',
'device_owner': 'network:ha_router_replicated_interface'
}
dummy_ports = {'ports': [
router_port,
vm_port1,
gateway_port,
dhcp_port,
ha_router_port
]}
used_ports = {'firewall_groups': [{'ports': [router_port['id']]}]}
used_ports = {'firewall_groups': [{'ports': [router_port['id'],
ha_router_port['id']]}]}
self.mock_list_ports.return_value = dummy_ports
self.mock_list_fwaas_firewall_groups.return_value = used_ports
ports = api_fwaas_v2.fwg_port_list_for_tenant(self.request, tenant_id)
self.assertEqual(vm_port1['id'], ports[0]['id'])
self.assertEqual(1, len(ports))
self.mock_list_ports.assert_called_once_with(tenant_id=tenant_id)
self.mock_list_fwaas_firewall_groups.assert_called_once_with(