x
/
vmware-nsx
Code Issues Proposed changes

Remove imports from neutron.plugins.vmware 

In order to get ready for relying exclusively on vmware plugin
code from stackforge/vmware-nsx, imports to neutron.plugins.vmware
which do not refer either to extensions or db models modules
must be removed.

Change-Id: Ib3708fc3e2a07f83c4d5ebac930ff2622296ad60
This commit is contained in:
Salvatore Orlando 2015-03-03 00:48:42 -08:00
parent c41f628d70
commit 432308fbd1
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vmware_nsx/neutron/plugins/vmware/api_client/client.py
View File

@ -19,10 +19,11 @@ import httplib
from neutron.i18n import _LE from neutron.i18n import _LE
from neutron.openstack.common import log as logging from neutron.openstack.common import log as logging
from neutron.plugins.vmware.api_client import exception
from vmware_nsx.neutron.plugins.vmware.api_client import base from vmware_nsx.neutron.plugins.vmware.api_client import base
from vmware_nsx.neutron.plugins.vmware.api_client import eventlet_client from vmware_nsx.neutron.plugins.vmware.api_client import eventlet_client
from vmware_nsx.neutron.plugins.vmware.api_client import eventlet_request from vmware_nsx.neutron.plugins.vmware.api_client import eventlet_request
from vmware_nsx.neutron.plugins.vmware.api_client import exception
from vmware_nsx.neutron.plugins.vmware.api_client import version from vmware_nsx.neutron.plugins.vmware.api_client import version
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

3
vmware_nsx/neutron/plugins/vmware/common/nsx_utils.py
View File

@ -19,8 +19,9 @@ from neutron.extensions import multiprovidernet as mpnet
from neutron.extensions import providernet as pnet from neutron.extensions import providernet as pnet
from neutron.i18n import _LW from neutron.i18n import _LW
from neutron.openstack.common import log from neutron.openstack.common import log
from neutron.plugins.vmware.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.api_client import client from vmware_nsx.neutron.plugins.vmware.api_client import client
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import utils as vmw_utils from vmware_nsx.neutron.plugins.vmware.common import utils as vmw_utils
from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db
from vmware_nsx.neutron.plugins.vmware.dbexts import networkgw_db from vmware_nsx.neutron.plugins.vmware.dbexts import networkgw_db

5
vmware_nsx/neutron/plugins/vmware/common/sync.py
View File

@ -28,8 +28,9 @@ from neutron.extensions import l3
from neutron.i18n import _LE, _LI, _LW from neutron.i18n import _LE, _LI, _LW
from neutron.openstack.common import log from neutron.openstack.common import log
from neutron.openstack.common import loopingcall from neutron.openstack.common import loopingcall
from neutron.plugins.vmware.api_client import exception as api_exc
from neutron.plugins.vmware.common import exceptions as nsx_exc from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import nsx_utils from vmware_nsx.neutron.plugins.vmware.common import nsx_utils
from vmware_nsx.neutron.plugins.vmware import nsxlib from vmware_nsx.neutron.plugins.vmware import nsxlib
from vmware_nsx.neutron.plugins.vmware.nsxlib import router as routerlib from vmware_nsx.neutron.plugins.vmware.nsxlib import router as routerlib

3
vmware_nsx/neutron/plugins/vmware/dbexts/nsxv_db.py
View File

@ -22,8 +22,9 @@ from sqlalchemy.sql import expression as expr
import neutron.db.api as db import neutron.db.api as db
from neutron.i18n import _, _LE from neutron.i18n import _, _LE
from neutron.openstack.common import log as logging from neutron.openstack.common import log as logging
from neutron.plugins.vmware.common import exceptions as nsx_exc
from neutron.plugins.vmware.dbexts import nsxv_models from neutron.plugins.vmware.dbexts import nsxv_models
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import nsxv_constants from vmware_nsx.neutron.plugins.vmware.common import nsxv_constants
from vmware_nsx.neutron.plugins.vmware.vshield.common import constants from vmware_nsx.neutron.plugins.vmware.vshield.common import constants

3
vmware_nsx/neutron/plugins/vmware/plugins/managers.py
View File

@ -17,7 +17,8 @@ from oslo.config import cfg
import stevedore import stevedore
from neutron.openstack.common import log from neutron.openstack.common import log
from neutron.plugins.vmware.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)

2
vmware_nsx/neutron/plugins/vmware/plugins/nsx_v.py
View File

@ -48,7 +48,6 @@ from neutron.extensions import securitygroup as ext_sg
from neutron.i18n import _LE, _LW from neutron.i18n import _LE, _LW
from neutron.openstack.common import log as logging from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils from neutron.openstack.common import uuidutils
from neutron.plugins.vmware.common import exceptions as nsx_exc
from neutron.plugins.vmware.extensions import ( from neutron.plugins.vmware.extensions import (
advancedserviceproviders as as_providers) advancedserviceproviders as as_providers)
from neutron.plugins.vmware.extensions import ( from neutron.plugins.vmware.extensions import (
@ -56,6 +55,7 @@ from neutron.plugins.vmware.extensions import (
from vmware_nsx.neutron.plugins import vmware from vmware_nsx.neutron.plugins import vmware
from vmware_nsx.neutron.plugins.vmware.common import config # noqa from vmware_nsx.neutron.plugins.vmware.common import config # noqa
from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
from vmware_nsx.neutron.plugins.vmware.common import utils as c_utils from vmware_nsx.neutron.plugins.vmware.common import utils as c_utils
from vmware_nsx.neutron.plugins.vmware.dbexts import ( from vmware_nsx.neutron.plugins.vmware.dbexts import (
routertype as rt_rtr) routertype as rt_rtr)

3
vmware_nsx/neutron/tests/unit/vmware/test_nsx_sync.py
View File

@ -27,11 +27,12 @@ from neutron.common import exceptions as n_exc
from neutron import context from neutron import context
from neutron.extensions import l3 from neutron.extensions import l3
from neutron.openstack.common import log from neutron.openstack.common import log
from neutron.plugins.vmware.api_client import exception as api_exc
from neutron.tests import base from neutron.tests import base
from neutron.tests.unit import test_api_v2 from neutron.tests.unit import test_api_v2
from neutron.tests.unit import testlib_api from neutron.tests.unit import testlib_api
from vmware_nsx.neutron.plugins.vmware.api_client import client from vmware_nsx.neutron.plugins.vmware.api_client import client
from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
from vmware_nsx.neutron.plugins.vmware.api_client import version from vmware_nsx.neutron.plugins.vmware.api_client import version
from vmware_nsx.neutron.plugins.vmware.common import sync from vmware_nsx.neutron.plugins.vmware.common import sync
from vmware_nsx.neutron.plugins.vmware.dbexts import db from vmware_nsx.neutron.plugins.vmware.dbexts import db