Move vmware_nsx/neutron/plugins/vmware to vmware_nsx

This is part of new vmware_nsx directory structure proposed in
https://goo.gl/GdWXyH.

Change-Id: I60d6ef62eb724df71dfda90137e00f107e220971

devstack/lib/vmware_dvs

@@ -61,7 +61,7 @@ function neutron_plugin_configure_common {
     mkdir -p /$Q_PLUGIN_CONF_PATH
     cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/$Q_PLUGIN_CONF_FILENAME /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
     Q_DB_NAME="neutron_nsx"
-    Q_PLUGIN_CLASS="vmware_nsx.neutron.plugins.vmware.plugin.NsxDvsPlugin"
+    Q_PLUGIN_CLASS="vmware_nsx.plugin.NsxDvsPlugin"
 }
 
 function neutron_plugin_configure_debug_command {

devstack/lib/vmware_nsx_v

@@ -53,7 +53,7 @@ function neutron_plugin_configure_common {
     mkdir -p /$Q_PLUGIN_CONF_PATH
     cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/$Q_PLUGIN_CONF_FILENAME /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
     Q_DB_NAME="neutron_nsx"
-    Q_PLUGIN_CLASS="vmware_nsx.neutron.plugins.vmware.plugin.NsxVPlugin"
+    Q_PLUGIN_CLASS="vmware_nsx.plugin.NsxVPlugin"
 }
 
 function neutron_plugin_configure_debug_command {

devstack/lib/vmware_nsx_v3

@@ -62,7 +62,7 @@ function neutron_plugin_configure_common {
     Q_PLUGIN_SRC_CONF_PATH=vmware-nsx/etc
     mkdir -p /$Q_PLUGIN_CONF_PATH
     cp $DEST/$Q_PLUGIN_SRC_CONF_PATH/$Q_PLUGIN_CONF_FILENAME /$Q_PLUGIN_CONF_PATH/$Q_PLUGIN_CONF_FILENAME
-    Q_PLUGIN_CLASS="vmware_nsx.neutron.plugins.vmware.plugins.nsx_v3_plugin.NsxV3Plugin"
+    Q_PLUGIN_CLASS="vmware_nsx.plugins.nsx_v3_plugin.NsxV3Plugin"
 }
 
 function neutron_plugin_configure_debug_command {

setup.cfg

@@ -26,18 +26,18 @@ data_files =
 
 [entry_points]
 console_scripts =
-    neutron-check-nsx-config = vmware_nsx.neutron.plugins.vmware.check_nsx_config:main
+    neutron-check-nsx-config = vmware_nsx.check_nsx_config:main
 neutron.db.alembic_migrations =
     vmware-nsx = vmware_nsx.db.migration:alembic_migrations
 neutron.core_plugins =
-    vmware = vmware_nsx.neutron.plugins.vmware.plugin:NsxMhPlugin
+    vmware = vmware_nsx.plugin:NsxMhPlugin
 neutron.service_plugins =
     vmware_nsx_l2gw = vmware_nsx.services.l2gateway.plugin:NsxL2GatewayPlugin
     vmware_nsx_qos = vmware_nsx.services.qos.plugin:NsxQosPlugin
 vmware_nsx.neutron.nsxv.router_type_drivers =
-    shared = vmware_nsx.neutron.plugins.vmware.plugins.nsx_v_drivers.shared_router_driver:RouterSharedDriver
-    distributed = vmware_nsx.neutron.plugins.vmware.plugins.nsx_v_drivers.distributed_router_driver:RouterDistributedDriver
-    exclusive = vmware_nsx.neutron.plugins.vmware.plugins.nsx_v_drivers.exclusive_router_driver:RouterExclusiveDriver
+    shared = vmware_nsx.plugins.nsx_v_drivers.shared_router_driver:RouterSharedDriver
+    distributed = vmware_nsx.plugins.nsx_v_drivers.distributed_router_driver:RouterDistributedDriver
+    exclusive = vmware_nsx.plugins.nsx_v_drivers.exclusive_router_driver:RouterExclusiveDriver
 [build_sphinx]
 source-dir = doc/source
 build-dir = doc/build

vmware_nsx/__init__.py

@@ -0,0 +1,3 @@
+import os
+
+NSX_EXT_PATH = os.path.join(os.path.dirname(__file__), 'extensions')

vmware_nsx/api_client/base.py

@@ -23,7 +23,7 @@ from oslo_log import log as logging
 import six
 from six.moves import http_client as httplib
 
-from vmware_nsx.neutron.plugins.vmware import api_client
+from vmware_nsx import api_client
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/api_client/client.py

@@ -20,11 +20,11 @@ from oslo_log import log as logging
 from six.moves import http_client as httplib
 
 from neutron.i18n import _LE
-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_request
-from vmware_nsx.neutron.plugins.vmware.api_client import exception
-from vmware_nsx.neutron.plugins.vmware.api_client import version
+from vmware_nsx.api_client import base
+from vmware_nsx.api_client import eventlet_client
+from vmware_nsx.api_client import eventlet_request
+from vmware_nsx.api_client import exception
+from vmware_nsx.api_client import version
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/api_client/eventlet_client.py

@@ -22,8 +22,8 @@ eventlet.monkey_patch()
 from oslo_log import log as logging
 
 from neutron.i18n import _LE
-from vmware_nsx.neutron.plugins.vmware.api_client import base
-from vmware_nsx.neutron.plugins.vmware.api_client import eventlet_request
+from vmware_nsx.api_client import base
+from vmware_nsx.api_client import eventlet_request
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/api_client/eventlet_request.py

@@ -22,7 +22,7 @@ from six.moves import http_client as httplib
 from six.moves.urllib import parse
 
 from neutron.i18n import _LI, _LW
-from vmware_nsx.neutron.plugins.vmware.api_client import request
+from vmware_nsx.api_client import request
 
 LOG = logging.getLogger(__name__)
 USER_AGENT = "Neutron eventlet client/2.0"

vmware_nsx/api_client/request.py

@@ -28,7 +28,7 @@ from six.moves import http_client as httplib
 import six.moves.urllib.parse as urlparse
 
 from neutron.i18n import _LI, _LW
-from vmware_nsx.neutron.plugins.vmware import api_client
+from vmware_nsx import api_client
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/check_nsx_config.py

@@ -20,9 +20,9 @@ import sys
 from oslo_config import cfg
 
 from neutron.common import config
-from vmware_nsx.neutron.plugins.vmware.common import config as nsx_config  # noqa
-from vmware_nsx.neutron.plugins.vmware.common import nsx_utils
-from vmware_nsx.neutron.plugins.vmware import nsxlib
+from vmware_nsx.common import config as nsx_config  # noqa
+from vmware_nsx.common import nsx_utils
+from vmware_nsx import nsxlib
 
 config.setup_logging()
 

vmware_nsx/common/config.py

@@ -17,7 +17,7 @@ import logging
 from oslo_config import cfg
 
 from neutron.i18n import _LW
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
+from vmware_nsx.common import exceptions as nsx_exc
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/common/nsx_utils.py

@@ -21,16 +21,16 @@ from neutron.i18n import _LW
 from oslo_log import log
 import six
 
-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.dbexts import db as nsx_db
-from vmware_nsx.neutron.plugins.vmware.dbexts import networkgw_db
-from vmware_nsx.neutron.plugins.vmware import nsx_cluster
-from vmware_nsx.neutron.plugins.vmware.nsxlib import l2gateway as l2gwlib
-from vmware_nsx.neutron.plugins.vmware.nsxlib import router as routerlib
-from vmware_nsx.neutron.plugins.vmware.nsxlib import secgroup as secgrouplib
-from vmware_nsx.neutron.plugins.vmware.nsxlib import switch as switchlib
+from vmware_nsx.api_client import client
+from vmware_nsx.api_client import exception as api_exc
+from vmware_nsx.common import utils as vmw_utils
+from vmware_nsx.db import db as nsx_db
+from vmware_nsx.db import networkgw_db
+from vmware_nsx import nsx_cluster
+from vmware_nsx.nsxlib import l2gateway as l2gwlib
+from vmware_nsx.nsxlib import router as routerlib
+from vmware_nsx.nsxlib import secgroup as secgrouplib
+from vmware_nsx.nsxlib import switch as switchlib
 
 LOG = log.getLogger(__name__)
 

vmware_nsx/common/securitygroups.py

@@ -16,7 +16,7 @@
 from oslo_log import log
 import six
 
-from vmware_nsx.neutron.plugins.vmware.common import nsx_utils
+from vmware_nsx.common import nsx_utils
 
 LOG = log.getLogger(__name__)
 # Protocol number look up for supported protocols

vmware_nsx/common/sync.py

@@ -30,12 +30,12 @@ from neutron.db import models_v2
 from neutron.extensions import l3
 from neutron.i18n import _LE, _LI, _LW
 
-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 import nsxlib
-from vmware_nsx.neutron.plugins.vmware.nsxlib import router as routerlib
-from vmware_nsx.neutron.plugins.vmware.nsxlib import switch as switchlib
+from vmware_nsx.api_client import exception as api_exc
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.common import nsx_utils
+from vmware_nsx import nsxlib
+from vmware_nsx.nsxlib import router as routerlib
+from vmware_nsx.nsxlib import switch as switchlib
 
 # Maximum page size for a single request
 # NOTE(salv-orlando): This might become a version-dependent map should the

vmware_nsx/db/db.py

@@ -21,8 +21,8 @@ from sqlalchemy.orm import exc
 
 import neutron.db.api as db
 
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.db import nsx_models
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/db/distributedrouter.py

@@ -15,7 +15,7 @@
 #
 
 from neutron.extensions import dvr as dist_rtr
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsxrouter
+from vmware_nsx.db import nsxrouter
 
 
 class DistributedRouter_mixin(nsxrouter.NsxRouterMixin):

vmware_nsx/db/lsn_db.py

@@ -19,8 +19,8 @@ from oslo_db import exception as d_exc
 from oslo_log import log as logging
 from sqlalchemy import orm
 
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as p_exc
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models
+from vmware_nsx.common import exceptions as p_exc
+from vmware_nsx.db import nsx_models
 
 
 LOG = logging.getLogger(__name__)

vmware_nsx/db/maclearning.py

@@ -20,8 +20,8 @@ from neutron.db import db_base_plugin_v2
 
 from oslo_log import log as logging
 
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models
-from vmware_nsx.neutron.plugins.vmware.extensions import maclearning as mac
+from vmware_nsx.db import nsx_models
+from vmware_nsx.extensions import maclearning as mac
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/db/migration/models/head.py

@@ -14,9 +14,9 @@
 
 from neutron.db.migration.models import head
 
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models  # noqa
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_models  # noqa
-from vmware_nsx.neutron.plugins.vmware.dbexts import vcns_models  # noqa
+from vmware_nsx.db import nsx_models  # noqa
+from vmware_nsx.db import nsxv_models  # noqa
+from vmware_nsx.db import vcns_models  # noqa
 
 
 def get_metadata():

vmware_nsx/db/networkgw_db.py

@@ -21,8 +21,8 @@ from oslo_log import log as logging
 from oslo_utils import uuidutils
 import six
 
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models
-from vmware_nsx.neutron.plugins.vmware.extensions import networkgw
+from vmware_nsx.db import nsx_models
+from vmware_nsx.extensions import networkgw
 
 LOG = logging.getLogger(__name__)
 DEVICE_OWNER_NET_GW_INTF = 'network:gateway-interface'

vmware_nsx/db/nsxrouter.py

@@ -17,7 +17,7 @@ from neutron.db import db_base_plugin_v2
 from neutron.extensions import l3
 from oslo_log import log as logging
 
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_models
+from vmware_nsx.db import nsxv_models
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/db/nsxv_db.py

@@ -24,10 +24,10 @@ from sqlalchemy.sql import expression as expr
 
 from neutron.i18n import _, _LE
 
-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.dbexts import nsxv_models
-from vmware_nsx.neutron.plugins.vmware.vshield.common import constants
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.common import nsxv_constants
+from vmware_nsx.db import nsxv_models
+from vmware_nsx.vshield.common import constants
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/db/nsxv_models.py

@@ -22,7 +22,7 @@ from neutron.db import l3_db
 from neutron.db import model_base
 from neutron.db import models_v2
 
-from vmware_nsx.neutron.plugins.vmware.common import nsxv_constants
+from vmware_nsx.common import nsxv_constants
 
 
 class NsxvRouterBinding(model_base.BASEV2, models_v2.HasStatusDescription):

vmware_nsx/db/qos_db.py

@@ -23,8 +23,8 @@ from neutron.i18n import _LI
 from oslo_log import log
 from oslo_utils import uuidutils
 
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models
-from vmware_nsx.neutron.plugins.vmware.extensions import qos
+from vmware_nsx.db import nsx_models
+from vmware_nsx.extensions import qos
 
 LOG = log.getLogger(__name__)
 

vmware_nsx/db/routertype.py

@@ -14,9 +14,9 @@
 #    under the License.
 #
 
-from vmware_nsx.neutron.plugins.vmware.dbexts import (
+from vmware_nsx.db import (
     distributedrouter as dist_rtr)
-from vmware_nsx.neutron.plugins.vmware.extensions import routertype as rt_rtr
+from vmware_nsx.extensions import routertype as rt_rtr
 
 
 class RouterType_mixin(dist_rtr.DistributedRouter_mixin):

vmware_nsx/db/vnic_index_db.py

@@ -20,8 +20,8 @@ from neutron.db import db_base_plugin_v2
 
 from oslo_log import log as logging
 
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_models
-from vmware_nsx.neutron.plugins.vmware.extensions import vnicindex as vnicidx
+from vmware_nsx.db import nsxv_models
+from vmware_nsx.extensions import vnicindex as vnicidx
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/dhcp_meta/combined.py

@@ -18,8 +18,8 @@
 from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
 from neutron.common import constants as const
 from neutron.common import topics
-from vmware_nsx.neutron.plugins.vmware.dhcp_meta import nsx as nsx_svc
-from vmware_nsx.neutron.plugins.vmware.dhcp_meta import rpc as nsx_rpc
+from vmware_nsx.dhcp_meta import nsx as nsx_svc
+from vmware_nsx.dhcp_meta import rpc as nsx_rpc
 
 
 class DhcpAgentNotifyAPI(dhcp_rpc_agent_api.DhcpAgentNotifyAPI):

vmware_nsx/dhcp_meta/lsnmanager.py

@@ -22,13 +22,13 @@ from oslo_log import log as logging
 from oslo_utils import excutils
 
 from neutron.i18n import _LE, _LW
-from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as p_exc
-from vmware_nsx.neutron.plugins.vmware.common import nsx_utils
-from vmware_nsx.neutron.plugins.vmware.dbexts import lsn_db
-from vmware_nsx.neutron.plugins.vmware.dhcp_meta import constants as const
-from vmware_nsx.neutron.plugins.vmware.nsxlib import lsn as lsn_api
-from vmware_nsx.neutron.plugins.vmware.nsxlib import switch as switch_api
+from vmware_nsx.api_client import exception as api_exc
+from vmware_nsx.common import exceptions as p_exc
+from vmware_nsx.common import nsx_utils
+from vmware_nsx.db import lsn_db
+from vmware_nsx.dhcp_meta import constants as const
+from vmware_nsx.nsxlib import lsn as lsn_api
+from vmware_nsx.nsxlib import switch as switch_api
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/dhcp_meta/migration.py

@@ -21,9 +21,9 @@ from neutron.extensions import external_net
 from oslo_log import log as logging
 
 from neutron.i18n import _LE
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as p_exc
-from vmware_nsx.neutron.plugins.vmware.dhcp_meta import nsx
-from vmware_nsx.neutron.plugins.vmware.dhcp_meta import rpc
+from vmware_nsx.common import exceptions as p_exc
+from vmware_nsx.dhcp_meta import nsx
+from vmware_nsx.dhcp_meta import rpc
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/dhcp_meta/nsx.py

@@ -26,9 +26,9 @@ from neutron.db import db_base_plugin_v2
 from neutron.db import l3_db
 from neutron.extensions import external_net
 from neutron.i18n import _LE, _LI
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as p_exc
-from vmware_nsx.neutron.plugins.vmware.dhcp_meta import constants as d_const
-from vmware_nsx.neutron.plugins.vmware.nsxlib import lsn as lsn_api
+from vmware_nsx.common import exceptions as p_exc
+from vmware_nsx.dhcp_meta import constants as d_const
+from vmware_nsx.nsxlib import lsn as lsn_api
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/dhcp_meta/rpc.py

@@ -26,9 +26,9 @@ from neutron.common import exceptions as ntn_exc
 from neutron.db import db_base_plugin_v2
 from neutron.db import models_v2
 from neutron.i18n import _LE, _LI, _LW
-from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
-from vmware_nsx.neutron.plugins.vmware.common import config
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
+from vmware_nsx.api_client import exception as api_exc
+from vmware_nsx.common import config
+from vmware_nsx.common import exceptions as nsx_exc
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/dhcpmeta_modes.py

@@ -29,14 +29,14 @@ from neutron.common import topics
 from neutron.db import agents_db
 from neutron.i18n import _LW
 
-from vmware_nsx.neutron.plugins.vmware.common import config
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
-from vmware_nsx.neutron.plugins.vmware.dhcp_meta import combined
-from vmware_nsx.neutron.plugins.vmware.dhcp_meta import lsnmanager
-from vmware_nsx.neutron.plugins.vmware.dhcp_meta import migration
-from vmware_nsx.neutron.plugins.vmware.dhcp_meta import nsx as nsx_svc
-from vmware_nsx.neutron.plugins.vmware.dhcp_meta import rpc as nsx_rpc
-from vmware_nsx.neutron.plugins.vmware.extensions import lsn
+from vmware_nsx.common import config
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.dhcp_meta import combined
+from vmware_nsx.dhcp_meta import lsnmanager
+from vmware_nsx.dhcp_meta import migration
+from vmware_nsx.dhcp_meta import nsx as nsx_svc
+from vmware_nsx.dhcp_meta import rpc as nsx_rpc
+from vmware_nsx.extensions import lsn
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/dvs/dvs.py

@@ -18,8 +18,8 @@ from oslo_utils import excutils
 from oslo_vmware import vim_util
 
 from neutron.i18n import _LE, _LI
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
-from vmware_nsx.neutron.plugins.vmware.dvs import dvs_utils
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.dvs import dvs_utils
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/extensions/nvp_qos.py

@@ -17,7 +17,7 @@
 # TODO(arosen): This is deprecated in Juno, and
 # to be removed in Kxxxx.
 
-from vmware_nsx.neutron.plugins.vmware.extensions import qos
+from vmware_nsx.extensions import qos
 
 
 class Nvp_qos(qos.Qos):

vmware_nsx/neutron/plugins/vmware/__init__.py

@@ -1,3 +0,0 @@
-import os
-
-NSX_EXT_PATH = os.path.join(os.path.dirname(__file__), 'extensions')

vmware_nsx/nsx_cluster.py

@@ -18,7 +18,7 @@ from oslo_log import log as logging
 import six
 
 from neutron.i18n import _LI
-from vmware_nsx.neutron.plugins.vmware.common import exceptions
+from vmware_nsx.common import exceptions
 
 LOG = logging.getLogger(__name__)
 DEFAULT_PORT = 443

vmware_nsx/nsxlib/__init__.py

@@ -19,8 +19,8 @@ from oslo_log import log
 from oslo_serialization import jsonutils
 import six
 
-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.api_client import exception as api_exc
+from vmware_nsx.common import exceptions as nsx_exc
 
 HTTP_GET = "GET"
 HTTP_POST = "POST"

vmware_nsx/nsxlib/l2gateway.py

@@ -18,11 +18,11 @@ from neutron.i18n import _LE
 from oslo_log import log
 from oslo_serialization import jsonutils
 
-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 utils
-from vmware_nsx.neutron.plugins.vmware import nsxlib
-from vmware_nsx.neutron.plugins.vmware.nsxlib import switch
+from vmware_nsx.api_client import exception as api_exc
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.common import utils
+from vmware_nsx import nsxlib
+from vmware_nsx.nsxlib import switch
 
 HTTP_GET = "GET"
 HTTP_POST = "POST"

vmware_nsx/nsxlib/lsn.py

@@ -18,10 +18,10 @@ from oslo_log import log
 from oslo_serialization import jsonutils
 import six
 
-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 utils
-from vmware_nsx.neutron.plugins.vmware import nsxlib
+from vmware_nsx.api_client import exception as api_exc
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.common import utils
+from vmware_nsx import nsxlib
 
 HTTP_GET = "GET"
 HTTP_POST = "POST"

vmware_nsx/nsxlib/queue.py

@@ -20,9 +20,9 @@ from oslo_serialization import jsonutils
 from oslo_utils import excutils
 import six
 
-from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
-from vmware_nsx.neutron.plugins.vmware.common import utils
-from vmware_nsx.neutron.plugins.vmware import nsxlib
+from vmware_nsx.api_client import exception as api_exc
+from vmware_nsx.common import utils
+from vmware_nsx import nsxlib
 
 HTTP_POST = "POST"
 HTTP_DELETE = "DELETE"

vmware_nsx/nsxlib/router.py

@@ -21,12 +21,12 @@ from oslo_utils import excutils
 import six
 
 from neutron.i18n import _LE, _LI, _LW
-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 utils
-from vmware_nsx.neutron.plugins.vmware import nsxlib
-from vmware_nsx.neutron.plugins.vmware.nsxlib import switch
-from vmware_nsx.neutron.plugins.vmware.nsxlib import versioning
+from vmware_nsx.api_client import exception as api_exc
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.common import utils
+from vmware_nsx import nsxlib
+from vmware_nsx.nsxlib import switch
+from vmware_nsx.nsxlib import versioning
 
 # @versioning.versioned decorator makes the apparent function body
 # totally unrelated to the real function.  This confuses pylint :(

vmware_nsx/nsxlib/secgroup.py

@@ -21,8 +21,8 @@ from neutron.common import constants
 from neutron.common import exceptions
 from neutron.i18n import _LW
 
-from vmware_nsx.neutron.plugins.vmware.common import utils
-from vmware_nsx.neutron.plugins.vmware import nsxlib
+from vmware_nsx.common import utils
+from vmware_nsx import nsxlib
 
 HTTP_GET = "GET"
 HTTP_POST = "POST"

vmware_nsx/nsxlib/switch.py

@@ -22,10 +22,10 @@ from neutron.common import constants
 from neutron.common import exceptions as exception
 from neutron.i18n import _LE, _LI, _LW
 
-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 utils
-from vmware_nsx.neutron.plugins.vmware import nsxlib
+from vmware_nsx.api_client import exception as api_exc
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.common import utils
+from vmware_nsx import nsxlib
 
 HTTP_GET = "GET"
 HTTP_POST = "POST"

vmware_nsx/nsxlib/v3/__init__.py

@@ -18,10 +18,10 @@ from oslo_log import log
 
 from neutron.i18n import _LW
 
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
-from vmware_nsx.neutron.plugins.vmware.common import nsx_constants
-from vmware_nsx.neutron.plugins.vmware.common import utils
-from vmware_nsx.neutron.plugins.vmware.nsxlib.v3 import client
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.common import nsx_constants
+from vmware_nsx.common import utils
+from vmware_nsx.nsxlib.v3 import client
 
 LOG = log.getLogger(__name__)
 

vmware_nsx/nsxlib/v3/client.py

@@ -20,7 +20,7 @@ import requests
 from requests import auth
 
 from neutron.i18n import _LW
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
+from vmware_nsx.common import exceptions as nsx_exc
 
 LOG = log.getLogger(__name__)
 

vmware_nsx/nsxlib/v3/dfw_api.py

@@ -18,9 +18,9 @@
 NSX-V3 Distributed Firewall
 """
 
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
-from vmware_nsx.neutron.plugins.vmware.common import utils
-from vmware_nsx.neutron.plugins.vmware.nsxlib.v3 import client as nsclient
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.common import utils
+from vmware_nsx.nsxlib.v3 import client as nsclient
 
 
 # firewall section types

vmware_nsx/nsxlib/v3/router.py

@@ -23,8 +23,8 @@ from neutron.common import exceptions as n_exc
 from neutron.i18n import _LW
 from oslo_log import log
 
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
-from vmware_nsx.neutron.plugins.vmware.nsxlib import v3 as nsxlib
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.nsxlib import v3 as nsxlib
 
 LOG = log.getLogger(__name__)
 

vmware_nsx/nsxlib/v3/security.py

@@ -20,8 +20,8 @@ NSX-V3 Plugin security integration module
 
 from neutron.db import securitygroups_db
 
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models
-from vmware_nsx.neutron.plugins.vmware.nsxlib.v3 import dfw_api as firewall
+from vmware_nsx.db import nsx_models
+from vmware_nsx.nsxlib.v3 import dfw_api as firewall
 
 
 NSGROUP_CONTAINER = 'NSGroup Container'

vmware_nsx/nsxlib/versioning.py

@@ -15,7 +15,7 @@
 
 import inspect
 
-from vmware_nsx.neutron.plugins.vmware.api_client import exception
+from vmware_nsx.api_client import exception
 
 DEFAULT_VERSION = -1
 

vmware_nsx/plugin.py

@@ -15,10 +15,10 @@
 #    under the License.
 #
 
-from vmware_nsx.neutron.plugins.vmware.plugins import base
-from vmware_nsx.neutron.plugins.vmware.plugins import dvs
-from vmware_nsx.neutron.plugins.vmware.plugins import nsx_v
-from vmware_nsx.neutron.plugins.vmware.plugins import nsx_v3_plugin
+from vmware_nsx.plugins import base
+from vmware_nsx.plugins import dvs
+from vmware_nsx.plugins import nsx_v
+from vmware_nsx.plugins import nsx_v3_plugin
 
 NsxPlugin = base.NsxPluginV2
 NsxVPlugin = nsx_v.NsxVPluginV2

vmware_nsx/plugins/base.py

@@ -59,28 +59,28 @@ from neutron.i18n import _LE, _LI, _LW
 from neutron.plugins.common import constants as plugin_const
 from neutron.plugins.common import utils
 
-from vmware_nsx.neutron.plugins import vmware
-from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
-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 nsx_utils
-from vmware_nsx.neutron.plugins.vmware.common import securitygroups as sg_utils
-from vmware_nsx.neutron.plugins.vmware.common import sync
-from vmware_nsx.neutron.plugins.vmware.common import utils as c_utils
-from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db
-from vmware_nsx.neutron.plugins.vmware.dbexts import maclearning as mac_db
-from vmware_nsx.neutron.plugins.vmware.dbexts import networkgw_db
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models
-from vmware_nsx.neutron.plugins.vmware.dbexts import qos_db
-from vmware_nsx.neutron.plugins.vmware import dhcpmeta_modes
-from vmware_nsx.neutron.plugins.vmware.extensions import maclearning as mac_ext
-from vmware_nsx.neutron.plugins.vmware.extensions import networkgw
-from vmware_nsx.neutron.plugins.vmware.extensions import qos
-from vmware_nsx.neutron.plugins.vmware.nsxlib import l2gateway as l2gwlib
-from vmware_nsx.neutron.plugins.vmware.nsxlib import queue as queuelib
-from vmware_nsx.neutron.plugins.vmware.nsxlib import router as routerlib
-from vmware_nsx.neutron.plugins.vmware.nsxlib import secgroup as secgrouplib
-from vmware_nsx.neutron.plugins.vmware.nsxlib import switch as switchlib
+import vmware_nsx
+from vmware_nsx.api_client import exception as api_exc
+from vmware_nsx.common import config  # noqa
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.common import nsx_utils
+from vmware_nsx.common import securitygroups as sg_utils
+from vmware_nsx.common import sync
+from vmware_nsx.common import utils as c_utils
+from vmware_nsx.db import db as nsx_db
+from vmware_nsx.db import maclearning as mac_db
+from vmware_nsx.db import networkgw_db
+from vmware_nsx.db import nsx_models
+from vmware_nsx.db import qos_db
+from vmware_nsx import dhcpmeta_modes
+from vmware_nsx.extensions import maclearning as mac_ext
+from vmware_nsx.extensions import networkgw
+from vmware_nsx.extensions import qos
+from vmware_nsx.nsxlib import l2gateway as l2gwlib
+from vmware_nsx.nsxlib import queue as queuelib
+from vmware_nsx.nsxlib import router as routerlib
+from vmware_nsx.nsxlib import secgroup as secgrouplib
+from vmware_nsx.nsxlib import switch as switchlib
 
 LOG = logging.getLogger(__name__)
 
@@ -165,7 +165,8 @@ class NsxPluginV2(addr_pair_db.AllowedAddressPairsMixin,
                        'default': self._nsx_delete_port}
         }
 
-        neutron_extensions.append_api_extensions_path([vmware.NSX_EXT_PATH])
+        neutron_extensions.append_api_extensions_path(
+            [vmware_nsx.NSX_EXT_PATH])
         self.nsx_opts = cfg.CONF.NSX
         self.nsx_sync_opts = cfg.CONF.NSX_SYNC
         self.cluster = nsx_utils.create_nsx_cluster(

vmware_nsx/plugins/dvs.py

@@ -39,15 +39,15 @@ from neutron.i18n import _LE, _LW
 from neutron.plugins.common import constants
 from neutron.plugins.common import utils
 
-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 exceptions as nsx_exc
-from vmware_nsx.neutron.plugins.vmware.common import nsx_constants
-from vmware_nsx.neutron.plugins.vmware.common import utils as c_utils
-from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db
-from vmware_nsx.neutron.plugins.vmware import dhcpmeta_modes
-from vmware_nsx.neutron.plugins.vmware.dvs import dvs
-from vmware_nsx.neutron.plugins.vmware.dvs import dvs_utils
+import vmware_nsx
+from vmware_nsx.common import config  # noqa
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.common import nsx_constants
+from vmware_nsx.common import utils as c_utils
+from vmware_nsx.db import db as nsx_db
+from vmware_nsx import dhcpmeta_modes
+from vmware_nsx.dvs import dvs
+from vmware_nsx.dvs import dvs_utils
 
 LOG = logging.getLogger(__name__)
 
@@ -80,7 +80,8 @@ class NsxDvsV2(addr_pair_db.AllowedAddressPairsMixin,
         super(NsxDvsV2, self).__init__()
         config.validate_config_options()
         LOG.debug('Driver support: DVS: %s' % dvs_utils.dvs_is_enabled())
-        neutron_extensions.append_api_extensions_path([vmware.NSX_EXT_PATH])
+        neutron_extensions.append_api_extensions_path(
+            [vmware_nsx.NSX_EXT_PATH])
         self._dvs = dvs.DvsManager()
 
         # Common driver code

vmware_nsx/plugins/managers.py

@@ -19,7 +19,7 @@ import stevedore
 from oslo_log import log
 
 from neutron.i18n import _LE, _LI
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
+from vmware_nsx.common import exceptions as nsx_exc
 
 LOG = log.getLogger(__name__)
 ROUTER_TYPE_DRIVERS = ["distributed", "exclusive", "shared"]

vmware_nsx/plugins/nsx_v.py

@@ -50,30 +50,30 @@ from neutron.i18n import _LE, _LI, _LW
 from neutron.plugins.common import constants as plugin_const
 from neutron.plugins.common import utils
 
-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 exceptions as nsx_exc
-from vmware_nsx.neutron.plugins.vmware.common import locking
-from vmware_nsx.neutron.plugins.vmware.common import nsx_constants
-from vmware_nsx.neutron.plugins.vmware.common import utils as c_utils
-from vmware_nsx.neutron.plugins.vmware.dbexts import (
+import vmware_nsx
+from vmware_nsx.common import config  # noqa
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.common import locking
+from vmware_nsx.common import nsx_constants
+from vmware_nsx.common import utils as c_utils
+from vmware_nsx.db import (
     routertype as rt_rtr)
-from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_db
-from vmware_nsx.neutron.plugins.vmware.dbexts import vnic_index_db
-from vmware_nsx.neutron.plugins.vmware.extensions import (
+from vmware_nsx.db import db as nsx_db
+from vmware_nsx.db import nsxv_db
+from vmware_nsx.db import vnic_index_db
+from vmware_nsx.extensions import (
     advancedserviceproviders as as_providers)
-from vmware_nsx.neutron.plugins.vmware.extensions import (
+from vmware_nsx.extensions import (
     vnicindex as ext_vnic_idx)
-from vmware_nsx.neutron.plugins.vmware.plugins import managers
-from vmware_nsx.neutron.plugins.vmware.plugins import nsx_v_md_proxy
-from vmware_nsx.neutron.plugins.vmware.vshield.common import (
+from vmware_nsx.plugins import managers
+from vmware_nsx.plugins import nsx_v_md_proxy
+from vmware_nsx.vshield.common import (
     constants as vcns_const)
-from vmware_nsx.neutron.plugins.vmware.vshield.common import (
+from vmware_nsx.vshield.common import (
     exceptions as vsh_exc)
-from vmware_nsx.neutron.plugins.vmware.vshield import edge_utils
-from vmware_nsx.neutron.plugins.vmware.vshield import securitygroup_utils
-from vmware_nsx.neutron.plugins.vmware.vshield import vcns_driver
+from vmware_nsx.vshield import edge_utils
+from vmware_nsx.vshield import securitygroup_utils
+from vmware_nsx.vshield import vcns_driver
 
 LOG = logging.getLogger(__name__)
 PORTGROUP_PREFIX = 'dvportgroup'
@@ -114,7 +114,8 @@ class NsxVPluginV2(agents_db.AgentDbMixin,
         super(NsxVPluginV2, self).__init__()
         self.metadata_proxy_handler = None
         config.validate_nsxv_config_options()
-        neutron_extensions.append_api_extensions_path([vmware.NSX_EXT_PATH])
+        neutron_extensions.append_api_extensions_path(
+            [vmware_nsx.NSX_EXT_PATH])
 
         self.base_binding_dict = {
             pbin.VNIC_TYPE: pbin.VNIC_NORMAL,

vmware_nsx/plugins/nsx_v3_plugin.py

@@ -56,15 +56,15 @@ from neutron.i18n import _LE, _LI, _LW
 from neutron.plugins.common import constants as plugin_const
 from neutron.plugins.common import utils as n_utils
 
-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 nsx_constants
-from vmware_nsx.neutron.plugins.vmware.common import utils
-from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db
-from vmware_nsx.neutron.plugins.vmware.nsxlib import v3 as nsxlib
-from vmware_nsx.neutron.plugins.vmware.nsxlib.v3 import dfw_api as firewall
-from vmware_nsx.neutron.plugins.vmware.nsxlib.v3 import router as routerlib
-from vmware_nsx.neutron.plugins.vmware.nsxlib.v3 import security
+from vmware_nsx.common import config  # noqa
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.common import nsx_constants
+from vmware_nsx.common import utils
+from vmware_nsx.db import db as nsx_db
+from vmware_nsx.nsxlib import v3 as nsxlib
+from vmware_nsx.nsxlib.v3 import dfw_api as firewall
+from vmware_nsx.nsxlib.v3 import router as routerlib
+from vmware_nsx.nsxlib.v3 import security
 
 LOG = log.getLogger(__name__)
 

vmware_nsx/plugins/nsx_v_drivers/distributed_router_driver.py

@@ -20,13 +20,13 @@ from neutron.common import exceptions as n_exc
 from neutron.db import l3_db
 from neutron.i18n import _LE
 
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_db
-from vmware_nsx.neutron.plugins.vmware.plugins import nsx_v
-from vmware_nsx.neutron.plugins.vmware.plugins.nsx_v_drivers import (
+from vmware_nsx.db import nsxv_db
+from vmware_nsx.plugins import nsx_v
+from vmware_nsx.plugins.nsx_v_drivers import (
     abstract_router_driver as router_driver)
-from vmware_nsx.neutron.plugins.vmware.vshield.common import (
+from vmware_nsx.vshield.common import (
     constants as vcns_const)
-from vmware_nsx.neutron.plugins.vmware.vshield import edge_utils
+from vmware_nsx.vshield import edge_utils
 
 LOG = logging.getLogger(__name__)
 METADATA_CIDR = '169.254.169.254/32'

vmware_nsx/plugins/nsx_v_drivers/exclusive_router_driver.py

@@ -16,13 +16,13 @@ from oslo_log import log as logging
 
 from neutron.api.v2 import attributes as attr
 
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsxv_exc
-from vmware_nsx.neutron.plugins.vmware.common import locking
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_db
-from vmware_nsx.neutron.plugins.vmware.plugins import nsx_v
-from vmware_nsx.neutron.plugins.vmware.plugins.nsx_v_drivers import (
+from vmware_nsx.common import exceptions as nsxv_exc
+from vmware_nsx.common import locking
+from vmware_nsx.db import nsxv_db
+from vmware_nsx.plugins import nsx_v
+from vmware_nsx.plugins.nsx_v_drivers import (
     abstract_router_driver as router_driver)
-from vmware_nsx.neutron.plugins.vmware.vshield import edge_utils
+from vmware_nsx.vshield import edge_utils
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/plugins/nsx_v_drivers/shared_router_driver.py

@@ -19,17 +19,17 @@ from neutron.api.v2 import attributes as attr
 from neutron.db import l3_db
 from neutron.db import models_v2
 from oslo_log import log as logging
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
-from vmware_nsx.neutron.plugins.vmware.common import locking
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_db
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_models
-from vmware_nsx.neutron.plugins.vmware.plugins import nsx_v
-from vmware_nsx.neutron.plugins.vmware.plugins.nsx_v_drivers import (
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.common import locking
+from vmware_nsx.db import nsxv_db
+from vmware_nsx.db import nsxv_models
+from vmware_nsx.plugins import nsx_v
+from vmware_nsx.plugins.nsx_v_drivers import (
     abstract_router_driver as router_driver)
-from vmware_nsx.neutron.plugins.vmware.plugins import nsx_v_md_proxy
-from vmware_nsx.neutron.plugins.vmware.vshield.common import (
+from vmware_nsx.plugins import nsx_v_md_proxy
+from vmware_nsx.vshield.common import (
     constants as vcns_const)
-from vmware_nsx.neutron.plugins.vmware.vshield import edge_utils
+from vmware_nsx.vshield import edge_utils
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/plugins/nsx_v_md_proxy.py

@@ -25,15 +25,15 @@ from oslo_config import cfg
 from oslo_log import log as logging
 
 from neutron.i18n import _LE
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsxv_exc
-from vmware_nsx.neutron.plugins.vmware.common import locking
-from vmware_nsx.neutron.plugins.vmware.common import nsxv_constants
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsxv_db
-from vmware_nsx.neutron.plugins.vmware.vshield import (
+from vmware_nsx.common import exceptions as nsxv_exc
+from vmware_nsx.common import locking
+from vmware_nsx.common import nsxv_constants
+from vmware_nsx.db import nsxv_db
+from vmware_nsx.vshield import (
     nsxv_loadbalancer as nsxv_lb)
-from vmware_nsx.neutron.plugins.vmware.vshield.common import (
+from vmware_nsx.vshield.common import (
     constants as vcns_const)
-from vmware_nsx.neutron.plugins.vmware.vshield import edge_utils
+from vmware_nsx.vshield import edge_utils
 
 METADATA_VSE_NAME = 'MdSrv'
 METADATA_IP_ADDR = '169.254.169.254'

vmware_nsx/services/l2gateway/nsx_v3_driver.py

@@ -34,11 +34,11 @@ from neutron.i18n import _LE, _LI
 from neutron import manager
 from neutron.plugins.common import utils as n_utils
 
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc
-from vmware_nsx.neutron.plugins.vmware.common import nsx_constants
-from vmware_nsx.neutron.plugins.vmware.common import utils as nsx_utils
-from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db
-from vmware_nsx.neutron.plugins.vmware.nsxlib import v3 as nsxlib
+from vmware_nsx.common import exceptions as nsx_exc
+from vmware_nsx.common import nsx_constants
+from vmware_nsx.common import utils as nsx_utils
+from vmware_nsx.db import db as nsx_db
+from vmware_nsx.nsxlib import v3 as nsxlib
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/services/l2gateway/plugin.py

@@ -21,7 +21,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import importutils
 
-from vmware_nsx.neutron.plugins.vmware.common import config  # noqa
+from vmware_nsx.common import config  # noqa
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/services/qos/plugin.py

@@ -22,8 +22,8 @@ from neutron.i18n import _LE, _LI
 from neutron.objects.qos import policy as policy_object
 from neutron.services.qos import qos_plugin
 
-from vmware_nsx.neutron.plugins.vmware.common import utils
-from vmware_nsx.neutron.plugins.vmware.nsxlib import v3 as nsxlib
+from vmware_nsx.common import utils
+from vmware_nsx.nsxlib import v3 as nsxlib
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/shell/__init__.py

@@ -17,7 +17,7 @@
 import sys
 
 from neutronclient import shell
-from vmware_nsx.neutron.plugins.vmware.shell import commands as cmd
+from vmware_nsx.shell import commands as cmd
 
 
 class NsxManage(shell.NeutronShell):

vmware_nsx/tests/unit/vmware/__init__.py

@@ -18,15 +18,15 @@ import os
 
 from networking_l2gw.db.l2gateway import l2gateway_models  # noqa
 
-from vmware_nsx.neutron.plugins.vmware.api_client import client as nsx_client
-from vmware_nsx.neutron.plugins.vmware.api_client import eventlet_client
-from vmware_nsx.neutron.plugins.vmware import extensions
-import vmware_nsx.neutron.plugins.vmware.plugin as neutron_plugin
-from vmware_nsx.neutron.plugins.vmware.vshield.common import (
+from vmware_nsx.api_client import client as nsx_client
+from vmware_nsx.api_client import eventlet_client
+from vmware_nsx import extensions
+import vmware_nsx.plugin as neutron_plugin
+from vmware_nsx.vshield.common import (
     VcnsApiClient as vcnsapi)
-from vmware_nsx.neutron.plugins.vmware.vshield import edge_utils
-from vmware_nsx.neutron.plugins.vmware.vshield import vcns
-import vmware_nsx.neutron.plugins.vmware.vshield.vcns_driver as vcnsdriver
+from vmware_nsx.vshield import edge_utils
+from vmware_nsx.vshield import vcns
+import vmware_nsx.vshield.vcns_driver as vcnsdriver
 
 
 plugin = neutron_plugin.NsxPlugin
@@ -54,5 +54,5 @@ def get_fake_conf(filename):
 
 
 def nsx_method(method_name, module_name='nsxlib'):
-    return '%s.%s.%s' % ('vmware_nsx.neutron.plugins.vmware', module_name,
+    return '%s.%s.%s' % ('vmware_nsx', module_name,
                          method_name)

vmware_nsx/tests/unit/vmware/apiclient/fake.py

@@ -18,7 +18,7 @@ from oslo_utils import uuidutils
 import six
 import six.moves.urllib.parse as urlparse
 
-from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc
+from vmware_nsx.api_client import exception as api_exc
 
 
 LOG = logging.getLogger(__name__)

vmware_nsx/tests/unit/vmware/apiclient/test_api_common.py

@@ -18,7 +18,7 @@
 from neutron.tests import base
 from six.moves import http_client as httplib
 
-from vmware_nsx.neutron.plugins.vmware import api_client
+from vmware_nsx import api_client
 
 
 class ApiCommonTest(base.BaseTestCase):

vmware_nsx/tests/unit/vmware/apiclient/test_api_eventlet_request.py

@@ -23,9 +23,9 @@ from oslo_log import log as logging
 from six.moves import http_client as httplib
 
 
-from vmware_nsx.neutron.plugins.vmware.api_client import (
+from vmware_nsx.api_client import (
     eventlet_client as client)
-from vmware_nsx.neutron.plugins.vmware.api_client import (
+from vmware_nsx.api_client import (
     eventlet_request as request)
 from vmware_nsx.tests.unit import vmware
 

vmware_nsx/tests/unit/vmware/db/test_lsn_db.py

@@ -17,9 +17,9 @@ from neutron import context
 from neutron.tests.unit import testlib_api
 from sqlalchemy import orm
 
-from vmware_nsx.neutron.plugins.vmware.common import exceptions as p_exc
-from vmware_nsx.neutron.plugins.vmware.dbexts import lsn_db
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models
+from vmware_nsx.common import exceptions as p_exc
+from vmware_nsx.db import lsn_db
+from vmware_nsx.db import nsx_models
 
 
 class LSNTestCase(testlib_api.SqlTestCase):

vmware_nsx/tests/unit/vmware/db/test_nsx_db.py

@@ -18,8 +18,8 @@ from neutron.db import models_v2
 from neutron.tests.unit import testlib_api
 from oslo_db import exception as d_exc
 
-from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db
-from vmware_nsx.neutron.plugins.vmware.dbexts import nsx_models
+from vmware_nsx.db import db as nsx_db
+from vmware_nsx.db import nsx_models
 
 
 class NsxDBTestCase(testlib_api.SqlTestCase):