From b00ae45140b737778caf0deace8ae833309a1bd6 Mon Sep 17 00:00:00 2001 From: Maurice Escher Date: Tue, 21 Feb 2023 18:09:28 +0100 Subject: [PATCH] ml2 plugin: use const from neutron-lib Due to the neutron-lib dependency, this patch bumps the needed library version to 3.4.0. Depends-On: https://review.opendev.org/c/openstack/neutron-lib/+/869294 Related-Bug: #2003095 Change-Id: I1aa7b73621e049d8f8a7038e3679cb8bbfc6313f --- neutron/plugins/ml2/common/constants.py | 3 --- neutron/plugins/ml2/plugin.py | 2 +- requirements.txt | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/neutron/plugins/ml2/common/constants.py b/neutron/plugins/ml2/common/constants.py index a6b015a7a68..f9e627ff59e 100644 --- a/neutron/plugins/ml2/common/constants.py +++ b/neutron/plugins/ml2/common/constants.py @@ -14,9 +14,6 @@ from neutron_lib import constants DEFAULT_DEVICE_OWNER = '' -# TODO(carthaca): use from neutron-lib once -# change id I9be781d99a08a6a015c3747eb15f20bc356cf08e has been released -DEVICE_OWNER_MANILA_PREFIX = "manila:" # TODO(liuyulong): move to neutron-lib or common constants NO_PBLOCKS_TYPES = [ diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index 4ecc5fbcb3b..59e84a1842c 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -2618,7 +2618,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, def _validate_port_supports_multiple_bindings(port): if not port['device_owner'].startswith(( const.DEVICE_OWNER_COMPUTE_PREFIX, - ml2_consts.DEVICE_OWNER_MANILA_PREFIX)): + const.DEVICE_OWNER_MANILA_PREFIX)): msg = _('Invalid port %s. Operation only valid on compute ' 'and shared filesystem ports') % port['id'] raise exc.BadRequest(resource='port', msg=msg) diff --git a/requirements.txt b/requirements.txt index c244de22b46..2b2d62fbb9c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ Jinja2>=2.10 # BSD License (3 clause) keystonemiddleware>=5.1.0 # Apache-2.0 netaddr>=0.7.18 # BSD netifaces>=0.10.4 # MIT -neutron-lib>=3.1.0 # Apache-2.0 +neutron-lib>=3.4.0 # Apache-2.0 python-neutronclient>=7.8.0 # Apache-2.0 tenacity>=6.0.0 # Apache-2.0 SQLAlchemy>=1.4.23 # MIT