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
changes/85/626385/2
Boden R 4 years ago committed by Adit Sarfaty
parent e5649bc23c
commit ebec296b85
  1. 2
      vmware_nsx/db/extended_security_group.py
  2. 2
      vmware_nsx/db/extended_security_group_rule.py
  3. 3
      vmware_nsx/db/maclearning.py
  4. 2
      vmware_nsx/db/nsx_portbindings_db.py
  5. 3
      vmware_nsx/db/nsxrouter.py
  6. 2
      vmware_nsx/db/qos_db.py
  7. 3
      vmware_nsx/db/vnic_index_db.py
  8. 2
      vmware_nsx/plugins/common/plugin.py
  9. 2
      vmware_nsx/plugins/dvs/plugin.py
  10. 2
      vmware_nsx/plugins/nsx/plugin.py
  11. 2
      vmware_nsx/plugins/nsx_mh/plugin.py
  12. 2
      vmware_nsx/plugins/nsx_p/plugin.py
  13. 2
      vmware_nsx/plugins/nsx_v/plugin.py
  14. 2
      vmware_nsx/plugins/nsx_v3/plugin.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

@ -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

@ -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

@ -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 _

@ -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__)

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

Loading…
Cancel
Save