openstack/neutron
Code Issues Proposed changes

ml2 plugin: use const from neutron-lib

Browse Source 
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
This commit is contained in:
Maurice Escher 2023-02-21 18:09:28 +01:00
parent c178c28fb8
commit b00ae45140
No known key found for this signature in database
GPG Key ID: CC56DEC23EE46750
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/plugins/ml2/common/constants.py
View File

@ -14,9 +14,6 @@
from neutron_lib import constants from neutron_lib import constants
DEFAULT_DEVICE_OWNER = '' 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 # TODO(liuyulong): move to neutron-lib or common constants
NO_PBLOCKS_TYPES = [ NO_PBLOCKS_TYPES = [

2
neutron/plugins/ml2/plugin.py
View File

@ -2618,7 +2618,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
def _validate_port_supports_multiple_bindings(port): def _validate_port_supports_multiple_bindings(port):
if not port['device_owner'].startswith(( if not port['device_owner'].startswith((
const.DEVICE_OWNER_COMPUTE_PREFIX, 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 ' msg = _('Invalid port %s. Operation only valid on compute '
'and shared filesystem ports') % port['id'] 'and shared filesystem ports') % port['id']
raise exc.BadRequest(resource='port', msg=msg) raise exc.BadRequest(resource='port', msg=msg)

2
requirements.txt
View File

@ -20,7 +20,7 @@ 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
netifaces>=0.10.4 # MIT 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 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