openstack/horizon
Code Issues Proposed changes

Merge "Fix allowed address pair row unique ID" into stable/2024.1

Browse Source
This commit is contained in:
Zuul 2024-11-11 17:24:41 +00:00 committed by Gerrit Code Review
commit 5dfb79b95f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/api/neutron.py
View File

@ -213,7 +213,8 @@ class PortAllowedAddressPair(NeutronAPIDictWrapper):
def __init__(self, addr_pair): def __init__(self, addr_pair):
super().__init__(addr_pair) super().__init__(addr_pair)
# Horizon references id property for table operations # Horizon references id property for table operations
self.id = addr_pair['ip_address'] mac_addr = addr_pair['mac_address'].replace(':', '-')
self.id = addr_pair['ip_address'] + ":" + mac_addr
class Router(NeutronAPIDictWrapper): class Router(NeutronAPIDictWrapper):

4
openstack_dashboard/dashboards/project/networks/ports/extensions/allowed_address_pairs/tables.py
View File

@ -81,13 +81,13 @@ class DeleteAllowedAddressPair(tables.DeleteAction):
return policy_target return policy_target
def delete(self, request, ip_address): def delete(self, request, obj_id):
try: try:
port_id = self.table.kwargs['port_id'] port_id = self.table.kwargs['port_id']
port = api.neutron.port_get(request, port_id) port = api.neutron.port_get(request, port_id)
pairs = port.get('allowed_address_pairs', []) pairs = port.get('allowed_address_pairs', [])
pairs = [pair for pair in pairs pairs = [pair for pair in pairs
if pair['ip_address'] != ip_address] if pair.id != obj_id]
pairs = [pair.to_dict() for pair in pairs] pairs = [pair.to_dict() for pair in pairs]
api.neutron.port_update(request, port_id, api.neutron.port_update(request, port_id,
allowed_address_pairs=pairs) allowed_address_pairs=pairs)

4
openstack_dashboard/dashboards/project/networks/ports/tests.py
View File

@ -486,8 +486,8 @@ class NetworkPortTests(test.TestCase):
self._stub_is_extension_supported({'mac-learning': False, self._stub_is_extension_supported({'mac-learning': False,
'allowed-address-pairs': True}) 'allowed-address-pairs': True})
pair_ip = pair['ip_address'] id = pair['ip_address'] + ":" + pair['mac_address'].replace(':', '-')
form_data = {'action': 'allowed_address_pairs__delete__%s' % pair_ip} form_data = {'action': 'allowed_address_pairs__delete__%s' % id}
url = reverse(detail_path, args=[pre_port.id]) url = reverse(detail_path, args=[pre_port.id])
res = self.client.post(url, form_data) res = self.client.post(url, form_data)