x/vmware-nsx
Code Issues Proposed changes

use model_query from neutron-lib

Browse Source 
The neutron.db._model_query modules was rehomed into neutron-lib and
also shimmed in neutron with https://review.openstack.org/#/c/591852/
This patch switches the imports over to use neutron-libs model_query
rather than neutrons.

Change-Id: I2e460e3cb93309e2539f94658d60c4ffca572e50
This commit is contained in:
Boden R 2018-11-01 09:53:39 -06:00 committed by Adit Sarfaty
parent db43ace22f
commit 842b8bda56
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmware_nsx/common/sync.py
View File

@ -19,6 +19,7 @@ import random
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 model_query
from neutron_lib import exceptions
from neutron_lib.exceptions import l3 as l3_exc
from oslo_log import log
@ -27,7 +28,6 @@ from oslo_service import loopingcall
from oslo_utils import timeutils
import six
from neutron.db import _model_query as model_query
from neutron.db.models import external_net as external_net_db
from neutron.db.models import l3 as l3_db
from neutron.db import models_v2

2
vmware_nsx/db/maclearning.py
View File

@ -15,11 +15,11 @@
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_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 utils as db_utils
from oslo_log import log as logging

2
vmware_nsx/db/networkgw_db.py
View File

@ -14,9 +14,9 @@
from sqlalchemy.orm import exc as sa_orm_exc
from neutron.db import _model_query as model_query
from neutron_lib import constants
from neutron_lib.db import api as db_api
from neutron_lib.db import model_query
from neutron_lib.db import utils as db_utils
from neutron_lib import exceptions
from neutron_lib.plugins import utils

2
vmware_nsx/db/qos_db.py
View File

@ -15,13 +15,13 @@
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 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 utils as db_utils
from oslo_log import log

2
vmware_nsx/plugins/nsx_mh/plugin.py
View File

@ -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 _model_query as model_query
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
@ -68,6 +67,7 @@ from neutron_lib.api.definitions import multiprovidernet as mpnet_apidef
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.exceptions import extraroute as xroute_exc
from neutron_lib.exceptions import multiprovidernet as mpnet_exc
from neutron_lib.plugins import utils