From ebec296b857410a1fcad7d276678886beb221024 Mon Sep 17 00:00:00 2001 From: Boden R Date: Wed, 19 Dec 2018 13:20:09 -0700 Subject: [PATCH] use neutron-lib for resource_extend The neutron code is already shimmed to use neutron-lib for the neutron.db._resource_extend module [1]. This patch switches the code over to use neutron-lib for resource_extend rather than neutron. [1] https://review.openstack.org/#/c/624179/ Change-Id: I594dab9e0d207d2565eb70093163b9d8a90602e1 --- vmware_nsx/db/extended_security_group.py | 2 +- vmware_nsx/db/extended_security_group_rule.py | 2 +- vmware_nsx/db/maclearning.py | 3 +-- vmware_nsx/db/nsx_portbindings_db.py | 2 +- vmware_nsx/db/nsxrouter.py | 3 +-- vmware_nsx/db/qos_db.py | 2 +- vmware_nsx/db/vnic_index_db.py | 3 +-- vmware_nsx/plugins/common/plugin.py | 2 +- vmware_nsx/plugins/dvs/plugin.py | 2 +- vmware_nsx/plugins/nsx/plugin.py | 2 +- vmware_nsx/plugins/nsx_mh/plugin.py | 2 +- vmware_nsx/plugins/nsx_p/plugin.py | 2 +- vmware_nsx/plugins/nsx_v/plugin.py | 2 +- vmware_nsx/plugins/nsx_v3/plugin.py | 2 +- 14 files changed, 14 insertions(+), 17 deletions(-) diff --git a/vmware_nsx/db/extended_security_group.py b/vmware_nsx/db/extended_security_group.py index 6a553c35ae..8c47d94fde 100644 --- a/vmware_nsx/db/extended_security_group.py +++ b/vmware_nsx/db/extended_security_group.py @@ -20,7 +20,6 @@ from sqlalchemy import orm from sqlalchemy.orm import exc from sqlalchemy import sql -from neutron.db import _resource_extend as resource_extend from neutron.db.models import securitygroup as securitygroups_db from neutron.extensions import securitygroup as ext_sg from neutron_lib.api.definitions import port as port_def @@ -31,6 +30,7 @@ from neutron_lib.callbacks import resources from neutron_lib import constants as n_constants from neutron_lib.db import api as db_api from neutron_lib.db import model_base +from neutron_lib.db import resource_extend from neutron_lib.objects import registry as obj_reg from neutron_lib.utils import helpers from neutron_lib.utils import net as n_utils diff --git a/vmware_nsx/db/extended_security_group_rule.py b/vmware_nsx/db/extended_security_group_rule.py index 649097aa01..60157485fe 100644 --- a/vmware_nsx/db/extended_security_group_rule.py +++ b/vmware_nsx/db/extended_security_group_rule.py @@ -18,11 +18,11 @@ import sqlalchemy as sa from sqlalchemy import orm from sqlalchemy.orm import exc -from neutron.db import _resource_extend as resource_extend from neutron.db.models import securitygroup from neutron.extensions import securitygroup as ext_sg from neutron_lib.api import validators from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib import exceptions as nexception from vmware_nsx._i18n import _ from vmware_nsx.extensions import secgroup_rule_local_ip_prefix as ext_local_ip diff --git a/vmware_nsx/db/maclearning.py b/vmware_nsx/db/maclearning.py index 16fab95bf6..0c2a7830fc 100644 --- a/vmware_nsx/db/maclearning.py +++ b/vmware_nsx/db/maclearning.py @@ -15,11 +15,10 @@ from sqlalchemy.orm import exc -from neutron.db import _resource_extend as resource_extend - from neutron_lib.api.definitions import port as port_def from neutron_lib.db import api as db_api from neutron_lib.db import model_query +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from oslo_log import log as logging diff --git a/vmware_nsx/db/nsx_portbindings_db.py b/vmware_nsx/db/nsx_portbindings_db.py index 98ba6cbcf1..ca9019dde5 100644 --- a/vmware_nsx/db/nsx_portbindings_db.py +++ b/vmware_nsx/db/nsx_portbindings_db.py @@ -22,11 +22,11 @@ from neutron_lib.api.definitions import provider_net as pnet from neutron_lib.api import validators from neutron_lib import constants from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib import exceptions from neutron_lib.plugins import directory from neutron_lib.plugins import utils as p_utils -from neutron.db import _resource_extend as resource_extend from neutron.db import portbindings_db as pbin_db from neutron.plugins.ml2 import models as pbin_model from vmware_nsx._i18n import _ diff --git a/vmware_nsx/db/nsxrouter.py b/vmware_nsx/db/nsxrouter.py index d832790d42..6132e4f38c 100644 --- a/vmware_nsx/db/nsxrouter.py +++ b/vmware_nsx/db/nsxrouter.py @@ -13,10 +13,9 @@ # under the License. # +from neutron_lib.db import resource_extend from oslo_log import log as logging -from neutron.db import _resource_extend as resource_extend - from vmware_nsx.db import nsxv_models LOG = logging.getLogger(__name__) diff --git a/vmware_nsx/db/qos_db.py b/vmware_nsx/db/qos_db.py index 76a78d1732..d672d4499f 100644 --- a/vmware_nsx/db/qos_db.py +++ b/vmware_nsx/db/qos_db.py @@ -15,13 +15,13 @@ from sqlalchemy.orm import exc -from neutron.db import _resource_extend as resource_extend 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 api as db_api from neutron_lib.db import model_query +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from oslo_log import log diff --git a/vmware_nsx/db/vnic_index_db.py b/vmware_nsx/db/vnic_index_db.py index 7002e0a5c4..c47d4acdd8 100644 --- a/vmware_nsx/db/vnic_index_db.py +++ b/vmware_nsx/db/vnic_index_db.py @@ -15,9 +15,8 @@ from sqlalchemy.orm import exc -from neutron.db import _resource_extend as resource_extend - from neutron_lib.api.definitions import port as port_def +from neutron_lib.db import resource_extend from oslo_db import exception as db_exc from oslo_log import log as logging diff --git a/vmware_nsx/plugins/common/plugin.py b/vmware_nsx/plugins/common/plugin.py index 9b7a598f56..3d803c38c7 100644 --- a/vmware_nsx/plugins/common/plugin.py +++ b/vmware_nsx/plugins/common/plugin.py @@ -15,7 +15,6 @@ from oslo_log import log as logging -from neutron.db import _resource_extend as resource_extend from neutron.db import address_scope_db from neutron.db import db_base_plugin_v2 from neutron.db import l3_attrs_db @@ -34,6 +33,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 api as db_api +from neutron_lib.db import resource_extend from neutron_lib import exceptions as n_exc from neutron_lib.plugins import directory from neutron_lib.utils import net as nl_net_utils diff --git a/vmware_nsx/plugins/dvs/plugin.py b/vmware_nsx/plugins/dvs/plugin.py index 80ef96be89..19d8bb2bd3 100644 --- a/vmware_nsx/plugins/dvs/plugin.py +++ b/vmware_nsx/plugins/dvs/plugin.py @@ -24,7 +24,6 @@ from oslo_utils import excutils 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 agentschedulers_db from neutron.db import allowedaddresspairs_db as addr_pair_db from neutron.db import dns_db @@ -46,6 +45,7 @@ from neutron_lib.api.definitions import vlantransparent as vlan_apidef from neutron_lib.api import validators from neutron_lib import constants from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib import exceptions as n_exc from neutron_lib.plugins import utils diff --git a/vmware_nsx/plugins/nsx/plugin.py b/vmware_nsx/plugins/nsx/plugin.py index b116c88537..614e588a8e 100644 --- a/vmware_nsx/plugins/nsx/plugin.py +++ b/vmware_nsx/plugins/nsx/plugin.py @@ -21,6 +21,7 @@ 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 api as db_api +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from neutron_lib.plugins import constants as plugin_constants from neutron_lib.plugins import directory @@ -29,7 +30,6 @@ from oslo_log import log as logging from oslo_utils import excutils from oslo_utils import uuidutils -from neutron.db import _resource_extend as resource_extend 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 477c46916a..5378578f9e 100644 --- a/vmware_nsx/plugins/nsx_mh/plugin.py +++ b/vmware_nsx/plugins/nsx_mh/plugin.py @@ -39,7 +39,6 @@ from sqlalchemy.orm import exc as sa_exc import webob.exc from neutron.api import extensions as neutron_extensions -from neutron.db import _resource_extend as resource_extend from neutron.db import agentschedulers_db from neutron.db import allowedaddresspairs_db as addr_pair_db from neutron.db import db_base_plugin_v2 @@ -68,6 +67,7 @@ from neutron_lib.api.definitions import portbindings as pbin from neutron_lib.api.definitions import provider_net as pnet from neutron_lib.db import api as db_api from neutron_lib.db import model_query +from neutron_lib.db import resource_extend from neutron_lib.exceptions import extraroute as xroute_exc from neutron_lib.exceptions import multiprovidernet as mpnet_exc from neutron_lib.plugins import utils diff --git a/vmware_nsx/plugins/nsx_p/plugin.py b/vmware_nsx/plugins/nsx_p/plugin.py index 7561cd9226..c004563fb5 100644 --- a/vmware_nsx/plugins/nsx_p/plugin.py +++ b/vmware_nsx/plugins/nsx_p/plugin.py @@ -22,7 +22,6 @@ from oslo_utils import excutils from oslo_utils import uuidutils import webob.exc -from neutron.db import _resource_extend as resource_extend from neutron.db import agentschedulers_db from neutron.db import allowedaddresspairs_db as addr_pair_db from neutron.db import dns_db @@ -55,6 +54,7 @@ from neutron_lib.callbacks import registry from neutron_lib.callbacks import resources from neutron_lib import constants as const from neutron_lib.db import api as db_api +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from neutron_lib import exceptions as n_exc diff --git a/vmware_nsx/plugins/nsx_v/plugin.py b/vmware_nsx/plugins/nsx_v/plugin.py index 060c96122d..ccaa5e1709 100644 --- a/vmware_nsx/plugins/nsx_v/plugin.py +++ b/vmware_nsx/plugins/nsx_v/plugin.py @@ -41,6 +41,7 @@ from neutron_lib import constants from neutron_lib import context as n_context from neutron_lib.db import api as db_api from neutron_lib.db import constants as db_const +from neutron_lib.db import resource_extend 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 @@ -67,7 +68,6 @@ from sqlalchemy.orm import exc as sa_exc from neutron.api import extensions as neutron_extensions from neutron.common import ipv6_utils from neutron.common import utils as n_utils -from neutron.db import _resource_extend as resource_extend from neutron.db import agents_db from neutron.db import allowedaddresspairs_db as addr_pair_db from neutron.db.availability_zone import router as router_az_db diff --git a/vmware_nsx/plugins/nsx_v3/plugin.py b/vmware_nsx/plugins/nsx_v3/plugin.py index 58fc606440..f41b051f95 100644 --- a/vmware_nsx/plugins/nsx_v3/plugin.py +++ b/vmware_nsx/plugins/nsx_v3/plugin.py @@ -27,6 +27,7 @@ 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 api as db_api +from neutron_lib.db import resource_extend from neutron_lib.db import utils as db_utils from neutron_lib.exceptions import l3 as l3_exc from neutron_lib.plugins import constants as plugin_const @@ -37,7 +38,6 @@ from neutron_lib.services.qos import constants as qos_consts from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.rpc.handlers import dhcp_rpc from neutron.api.rpc.handlers import metadata_rpc -from neutron.db import _resource_extend as resource_extend from neutron.db import agents_db from neutron.db import agentschedulers_db from neutron.db import allowedaddresspairs_db as addr_pair_db