x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|V3: fix path for exceptions"

Browse Source
This commit is contained in:
Jenkins 2016-11-10 12:57:36 +00:00 committed by Gerrit Code Review
commit 0e71c023c5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmware_nsx/shell/admin/plugins/nsxv3/resources/networks.py
View File

@ -16,12 +16,12 @@
import logging import logging
from vmware_nsx._i18n import _LI from vmware_nsx._i18n import _LI
from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.db import db as nsx_db from vmware_nsx.db import db as nsx_db
from vmware_nsx.shell.admin.plugins.common import constants from vmware_nsx.shell.admin.plugins.common import constants
from vmware_nsx.shell.admin.plugins.common import formatters from vmware_nsx.shell.admin.plugins.common import formatters
from vmware_nsx.shell.admin.plugins.common import utils as admin_utils from vmware_nsx.shell.admin.plugins.common import utils as admin_utils
from vmware_nsx.shell import resources as shell from vmware_nsx.shell import resources as shell
from vmware_nsxlib.v3 import exceptions as nsx_exc
from neutron.callbacks import registry from neutron.callbacks import registry
from neutron import context as neutron_context from neutron import context as neutron_context

2
vmware_nsx/shell/admin/plugins/nsxv3/resources/ports.py
View File

@ -19,7 +19,6 @@ from oslo_config import cfg
from sqlalchemy.orm import exc from sqlalchemy.orm import exc
from vmware_nsx._i18n import _LE, _LI, _LW from vmware_nsx._i18n import _LE, _LI, _LW
from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.db import db as nsx_db from vmware_nsx.db import db as nsx_db
from vmware_nsx.db import nsx_models from vmware_nsx.db import nsx_models
from vmware_nsx.dvs import dvs from vmware_nsx.dvs import dvs
@ -30,6 +29,7 @@ from vmware_nsx.shell.admin.plugins.common import formatters
from vmware_nsx.shell.admin.plugins.common import utils as admin_utils from vmware_nsx.shell.admin.plugins.common import utils as admin_utils
from vmware_nsx.shell.admin.plugins.nsxv3.resources import utils as v3_utils from vmware_nsx.shell.admin.plugins.nsxv3.resources import utils as v3_utils
from vmware_nsx.shell import resources as shell from vmware_nsx.shell import resources as shell
from vmware_nsxlib.v3 import exceptions as nsx_exc
from vmware_nsxlib.v3 import resources from vmware_nsxlib.v3 import resources
from neutron.callbacks import registry from neutron.callbacks import registry

2
vmware_nsx/shell/admin/plugins/nsxv3/resources/routers.py
View File

@ -16,13 +16,13 @@
import logging import logging
from vmware_nsx._i18n import _LI from vmware_nsx._i18n import _LI
from vmware_nsx.common import exceptions as nsx_exc
from vmware_nsx.db import db as nsx_db from vmware_nsx.db import db as nsx_db
from vmware_nsx.shell.admin.plugins.common import constants from vmware_nsx.shell.admin.plugins.common import constants
from vmware_nsx.shell.admin.plugins.common import formatters from vmware_nsx.shell.admin.plugins.common import formatters
from vmware_nsx.shell.admin.plugins.common import utils as admin_utils from vmware_nsx.shell.admin.plugins.common import utils as admin_utils
from vmware_nsx.shell.admin.plugins.nsxv3.resources import utils from vmware_nsx.shell.admin.plugins.nsxv3.resources import utils
from vmware_nsx.shell import resources as shell from vmware_nsx.shell import resources as shell
from vmware_nsxlib.v3 import exceptions as nsx_exc
from vmware_nsxlib.v3 import resources as nsx_resources from vmware_nsxlib.v3 import resources as nsx_resources
from neutron.callbacks import registry from neutron.callbacks import registry