diff --git a/lower-constraints.txt b/lower-constraints.txt index beb5fa33c0..c5475e0098 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -54,7 +54,7 @@ msgpack-python==0.4.0 munch==2.1.0 netaddr==0.7.18 netifaces==0.10.4 -neutron-lib==1.13.0 +neutron-lib==1.14.0 openstackdocstheme==1.18.1 openstacksdk==0.11.2 os-client-config==1.28.0 diff --git a/requirements.txt b/requirements.txt index eb6fd5da1c..f5a9ee5c67 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ tenacity>=4.4.0 # Apache-2.0 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT six>=1.10.0 # MIT stevedore>=1.20.0 # Apache-2.0 -neutron-lib>=1.13.0 # Apache-2.0 +neutron-lib>=1.14.0 # Apache-2.0 osc-lib>=1.8.0 # Apache-2.0 python-openstackclient>=3.12.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0 diff --git a/vmware_nsx/db/maclearning.py b/vmware_nsx/db/maclearning.py index 362156a9c1..922dd6fd32 100644 --- a/vmware_nsx/db/maclearning.py +++ b/vmware_nsx/db/maclearning.py @@ -17,10 +17,10 @@ from sqlalchemy.orm import exc from neutron.db import _model_query as model_query from neutron.db import _resource_extend as resource_extend -from neutron.db import _utils as db_utils from neutron.db import api as db_api from neutron_lib.api.definitions import port as port_def +from neutron_lib.db import utils as db_utils from oslo_log import log as logging diff --git a/vmware_nsx/db/networkgw_db.py b/vmware_nsx/db/networkgw_db.py index ff031e5faf..15725faa8d 100644 --- a/vmware_nsx/db/networkgw_db.py +++ b/vmware_nsx/db/networkgw_db.py @@ -15,9 +15,9 @@ from sqlalchemy.orm import exc as sa_orm_exc from neutron.db import _model_query as model_query -from neutron.db import _utils as db_utils from neutron.db import api as db_api from neutron_lib import constants +from neutron_lib.db import utils as db_utils from neutron_lib import exceptions from neutron_lib.plugins import utils from oslo_log import log as logging diff --git a/vmware_nsx/db/qos_db.py b/vmware_nsx/db/qos_db.py index 3157d6e3f0..d67d648666 100644 --- a/vmware_nsx/db/qos_db.py +++ b/vmware_nsx/db/qos_db.py @@ -17,12 +17,12 @@ from sqlalchemy.orm import exc from neutron.db import _model_query as model_query from neutron.db import _resource_extend as resource_extend -from neutron.db import _utils as db_utils from neutron.db import api as db_api from neutron.db import models_v2 from neutron_lib.api.definitions import network as net_def from neutron_lib.api.definitions import port as port_def +from neutron_lib.db import utils as db_utils from oslo_log import log from oslo_utils import uuidutils diff --git a/vmware_nsx/plugins/dvs/plugin.py b/vmware_nsx/plugins/dvs/plugin.py index 581f5176b7..9632e55d3e 100644 --- a/vmware_nsx/plugins/dvs/plugin.py +++ b/vmware_nsx/plugins/dvs/plugin.py @@ -15,6 +15,7 @@ from neutron_lib.api.definitions import allowedaddresspairs as addr_apidef from neutron_lib.api.definitions import port_security as psec +from neutron_lib.db import utils as db_utils from neutron_lib.exceptions import allowedaddresspairs as addr_exc from neutron_lib.exceptions import port_security as psec_exc from oslo_config import cfg @@ -24,7 +25,6 @@ from oslo_utils import uuidutils from neutron.api import extensions as neutron_extensions from neutron.db import _resource_extend as resource_extend -from neutron.db import _utils as db_utils from neutron.db import agentschedulers_db from neutron.db import allowedaddresspairs_db as addr_pair_db from neutron.db import api as db_api diff --git a/vmware_nsx/plugins/nsx/plugin.py b/vmware_nsx/plugins/nsx/plugin.py index a818f67d57..16961fd403 100644 --- a/vmware_nsx/plugins/nsx/plugin.py +++ b/vmware_nsx/plugins/nsx/plugin.py @@ -20,6 +20,7 @@ from neutron_lib.callbacks import events from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources from neutron_lib import context as n_context +from neutron_lib.db import utils as db_utils from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory from oslo_config import cfg @@ -28,7 +29,6 @@ from oslo_utils import excutils from oslo_utils import uuidutils from neutron.db import _resource_extend as resource_extend -from neutron.db import _utils as db_utils from neutron.db import agents_db from neutron.db import agentschedulers_db from neutron.db import allowedaddresspairs_db as addr_pair_db diff --git a/vmware_nsx/plugins/nsx_mh/plugin.py b/vmware_nsx/plugins/nsx_mh/plugin.py index d8d1c066db..47e90e1951 100644 --- a/vmware_nsx/plugins/nsx_mh/plugin.py +++ b/vmware_nsx/plugins/nsx_mh/plugin.py @@ -20,6 +20,7 @@ from neutron_lib.api import faults from neutron_lib.api import validators from neutron_lib import constants from neutron_lib import context as q_context +from neutron_lib.db import utils as db_utils from neutron_lib import exceptions as n_exc from neutron_lib.exceptions import allowedaddresspairs as addr_exc from neutron_lib.exceptions import l3 as l3_exc @@ -38,7 +39,6 @@ import webob.exc from neutron.api import extensions as neutron_extensions from neutron.db import _model_query as model_query from neutron.db import _resource_extend as resource_extend -from neutron.db import _utils as db_utils from neutron.db import agentschedulers_db from neutron.db import allowedaddresspairs_db as addr_pair_db from neutron.db import api as db_api diff --git a/vmware_nsx/plugins/nsx_v/plugin.py b/vmware_nsx/plugins/nsx_v/plugin.py index ca430b7887..cef3e90907 100644 --- a/vmware_nsx/plugins/nsx_v/plugin.py +++ b/vmware_nsx/plugins/nsx_v/plugin.py @@ -38,6 +38,7 @@ from neutron_lib.callbacks import resources from neutron_lib import constants from neutron_lib import context as n_context from neutron_lib.db import constants as db_const +from neutron_lib.db import utils as db_utils from neutron_lib import exceptions as n_exc from neutron_lib.exceptions import allowedaddresspairs as addr_exc from neutron_lib.exceptions import flavors as flav_exc @@ -63,7 +64,6 @@ from neutron.common import ipv6_utils from neutron.common import rpc as n_rpc from neutron.common import utils as n_utils from neutron.db import _resource_extend as resource_extend -from neutron.db import _utils as db_utils from neutron.db import agents_db from neutron.db import allowedaddresspairs_db as addr_pair_db from neutron.db import api as db_api diff --git a/vmware_nsx/plugins/nsx_v3/plugin.py b/vmware_nsx/plugins/nsx_v3/plugin.py index be8b7e378c..f78295bcc5 100644 --- a/vmware_nsx/plugins/nsx_v3/plugin.py +++ b/vmware_nsx/plugins/nsx_v3/plugin.py @@ -24,6 +24,7 @@ from neutron_lib.api.definitions import port_security as psec from neutron_lib.api import extensions from neutron_lib.api import faults from neutron_lib.api.validators import availability_zone as az_validator +from neutron_lib.db import utils as db_utils from neutron_lib.exceptions import allowedaddresspairs as addr_exc from neutron_lib.exceptions import l3 as l3_exc from neutron_lib.exceptions import port_security as psec_exc @@ -36,7 +37,6 @@ from neutron.api.rpc.handlers import dhcp_rpc from neutron.api.rpc.handlers import metadata_rpc from neutron.common import rpc as n_rpc from neutron.db import _resource_extend as resource_extend -from neutron.db import _utils as db_utils from neutron.db import agents_db from neutron.db import agentschedulers_db from neutron.db import allowedaddresspairs_db as addr_pair_db