diff options
| author | Maurice Escher <maurice.escher@sap.com> | 2023-02-21 18:09:28 +0100 |
|---|---|---|
| committer | Maurice Escher <maurice.escher@sap.com> | 2023-02-21 18:09:28 +0100 |
| commit | b00ae45140b737778caf0deace8ae833309a1bd6 (patch) | |
| tree | 4892f95fdd0a73a0b6b14e11cce8c944da5a9050 /neutron/plugins | |
| parent | c178c28fb8f21c1ea145f696cf724aa9038012b2 (diff) | |
| download | neutron-b00ae45140b737778caf0deace8ae833309a1bd6.tar.gz | |
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
Diffstat (limited to 'neutron/plugins')
| -rw-r--r-- | neutron/plugins/ml2/common/constants.py | 3 | ||||
| -rw-r--r-- | neutron/plugins/ml2/plugin.py | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/neutron/plugins/ml2/common/constants.py b/neutron/plugins/ml2/common/constants.py index a6b015a7a6..f9e627ff59 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 4ecc5fbcb3..59e84a1842 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) |