openstack/neutron
Code Issues Proposed changes

Use ALLOWED_ADDRESS_PAIR resources constant from neutron_lib

Browse Source 
It was introduced in neutron-lib 3.21.0 so it can be used in neutron
now.

Related-bug: #2116249

Change-Id: I114e14335b9e701981c8ad6e3c846cb4d3cb7fce
Signed-off-by: Slawek Kaplonski <skaplons@redhat.com>
This commit is contained in:
Slawek Kaplonski
2025-07-21 17:25:51 +02:00
parent 79e9b02c65
commit 7eb0f0b337
4 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/db/allowedaddresspairs_db.py
View File

@@ -19,6 +19,7 @@ from neutron_lib.api.definitions import port as port_def
from neutron_lib.api import validators from neutron_lib.api import validators
from neutron_lib.callbacks import events from neutron_lib.callbacks import events
from neutron_lib.callbacks import registry from neutron_lib.callbacks import registry
from neutron_lib.callbacks import resources
from neutron_lib.db import api as db_api from neutron_lib.db import api as db_api
from neutron_lib.db import resource_extend from neutron_lib.db import resource_extend
from neutron_lib.db import utils as db_utils from neutron_lib.db import utils as db_utils
@@ -44,10 +45,8 @@ class AllowedAddressPairsMixin:
'network_id': port['network_id'], 'network_id': port['network_id'],
'allowed_address_pairs': allowed_address_pairs, 'allowed_address_pairs': allowed_address_pairs,
} }
# TODO(slaweq): use constant from neutron_lib.callbacks.resources once
# it will be available and released
registry.publish( registry.publish(
'allowed_address_pair', events.BEFORE_CREATE, self, resources.ALLOWED_ADDRESS_PAIR, events.BEFORE_CREATE, self,
payload=events.DBEventPayload( payload=events.DBEventPayload(
context, context,
resource_id=port['id'], resource_id=port['id'],

4
neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py
View File

@@ -305,10 +305,8 @@ class OVNMechanismDriver(api.MechanismDriver):
registry.subscribe(self.delete_segment_provnet_port, registry.subscribe(self.delete_segment_provnet_port,
resources.SEGMENT, resources.SEGMENT,
events.AFTER_DELETE) events.AFTER_DELETE)
# TODO(slaweq): use constant from neutron_lib.callbacks.resources once
# it will be available and released
registry.subscribe(self._validate_allowed_address_pairs, registry.subscribe(self._validate_allowed_address_pairs,
'allowed_address_pair', resources.ALLOWED_ADDRESS_PAIR,
events.BEFORE_CREATE) events.BEFORE_CREATE)
# Handle security group/rule or address group notifications # Handle security group/rule or address group notifications

5
neutron/tests/unit/db/test_l3_db.py
View File

@@ -1081,10 +1081,7 @@ class L3TestCase(test_db_base_plugin_v2.NeutronDbPluginV2TestCase):
self.mixin, payload=mock.ANY), self.mixin, payload=mock.ANY),
mock.call(resources.PORT, events.BEFORE_CREATE, mock.call(resources.PORT, events.BEFORE_CREATE,
mock.ANY, payload=mock.ANY), mock.ANY, payload=mock.ANY),
# TODO(slaweq): use constant from mock.call(resources.ALLOWED_ADDRESS_PAIR, events.BEFORE_CREATE,
# neutron_lib.callbacks.resources once it will be available
# and released
mock.call('allowed_address_pair', events.BEFORE_CREATE,
mock.ANY, payload=mock.ANY), mock.ANY, payload=mock.ANY),
mock.call(resources.PORT, events.PRECOMMIT_CREATE, mock.call(resources.PORT, events.PRECOMMIT_CREATE,
mock.ANY, payload=mock.ANY), mock.ANY, payload=mock.ANY),

2
requirements.txt
View File

@@ -15,7 +15,7 @@ requests>=2.32.3 # Apache-2.0
Jinja2>=2.10 # BSD License (3 clause) Jinja2>=2.10 # BSD License (3 clause)
keystonemiddleware>=5.1.0 # Apache-2.0 keystonemiddleware>=5.1.0 # Apache-2.0
netaddr>=0.7.18 # BSD netaddr>=0.7.18 # BSD
neutron-lib>=3.20.0 # Apache-2.0 neutron-lib>=3.21.0 # Apache-2.0
python-neutronclient>=7.8.0 # Apache-2.0 python-neutronclient>=7.8.0 # Apache-2.0
tenacity>=6.0.0 # Apache-2.0 tenacity>=6.0.0 # Apache-2.0
SQLAlchemy>=1.4.23 # MIT SQLAlchemy>=1.4.23 # MIT