From cf39d9a6d706d0ffcd9c23cbe2c56b0ffcb4b038 Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Mon, 16 Mar 2015 08:58:00 -0700 Subject: [PATCH] Use uuidutils from oslo_utils Stop using it from neutron.openstack.common as the module has now graduated Change-Id: If26ef6f0923ba3e51b917bc53dc9df34f5c24b81 Closes-Bug: #1432713 --- vmware_nsx/neutron/plugins/vmware/dbexts/networkgw_db.py | 3 +-- vmware_nsx/neutron/plugins/vmware/dbexts/qos_db.py | 3 +-- vmware_nsx/neutron/plugins/vmware/plugins/nsx_v.py | 2 +- vmware_nsx/neutron/plugins/vmware/vshield/edge_utils.py | 2 +- vmware_nsx/neutron/tests/unit/vmware/apiclient/fake.py | 2 +- .../neutron/tests/unit/vmware/extensions/test_vnic_index.py | 2 +- vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_router.py | 6 ++---- vmware_nsx/neutron/tests/unit/vmware/test_dvs.py | 2 +- vmware_nsx/neutron/tests/unit/vmware/test_nsx_opts.py | 2 +- vmware_nsx/neutron/tests/unit/vmware/test_nsx_plugin.py | 2 +- vmware_nsx/neutron/tests/unit/vmware/test_nsx_utils.py | 2 +- vmware_nsx/neutron/tests/unit/vmware/test_nsx_v_plugin.py | 2 +- vmware_nsx/neutron/tests/unit/vmware/vshield/fake_vcns.py | 2 +- .../neutron/tests/unit/vmware/vshield/test_edge_utils.py | 2 +- 14 files changed, 15 insertions(+), 19 deletions(-) diff --git a/vmware_nsx/neutron/plugins/vmware/dbexts/networkgw_db.py b/vmware_nsx/neutron/plugins/vmware/dbexts/networkgw_db.py index fef1eb0d0e..20a2a98393 100644 --- a/vmware_nsx/neutron/plugins/vmware/dbexts/networkgw_db.py +++ b/vmware_nsx/neutron/plugins/vmware/dbexts/networkgw_db.py @@ -17,11 +17,10 @@ from sqlalchemy.orm import exc as sa_orm_exc from neutron.api.v2 import attributes from neutron.common import exceptions from neutron.common import utils -from neutron.openstack.common import uuidutils from neutron.plugins.vmware.dbexts import nsx_models from neutron.plugins.vmware.extensions import networkgw from oslo_log import log as logging - +from oslo_utils import uuidutils LOG = logging.getLogger(__name__) DEVICE_OWNER_NET_GW_INTF = 'network:gateway-interface' diff --git a/vmware_nsx/neutron/plugins/vmware/dbexts/qos_db.py b/vmware_nsx/neutron/plugins/vmware/dbexts/qos_db.py index 1ee7bd05e8..3c971e09ba 100644 --- a/vmware_nsx/neutron/plugins/vmware/dbexts/qos_db.py +++ b/vmware_nsx/neutron/plugins/vmware/dbexts/qos_db.py @@ -19,11 +19,10 @@ from neutron.api.v2 import attributes as attr from neutron.db import db_base_plugin_v2 from neutron.db import models_v2 from neutron.i18n import _LI -from neutron.openstack.common import uuidutils from neutron.plugins.vmware.dbexts import nsx_models from neutron.plugins.vmware.extensions import qos from oslo_log import log - +from oslo_utils import uuidutils LOG = log.getLogger(__name__) diff --git a/vmware_nsx/neutron/plugins/vmware/plugins/nsx_v.py b/vmware_nsx/neutron/plugins/vmware/plugins/nsx_v.py index 5d6c6ee31d..901f45ae9c 100644 --- a/vmware_nsx/neutron/plugins/vmware/plugins/nsx_v.py +++ b/vmware_nsx/neutron/plugins/vmware/plugins/nsx_v.py @@ -20,6 +20,7 @@ from oslo_concurrency import lockutils from oslo_config import cfg from oslo_log import log as logging from oslo_utils import excutils +from oslo_utils import uuidutils from sqlalchemy.orm import exc as sa_exc from neutron.api import extensions as neutron_extensions @@ -47,7 +48,6 @@ from neutron.extensions import portsecurity as psec from neutron.extensions import providernet as pnet from neutron.extensions import securitygroup as ext_sg from neutron.i18n import _LE, _LI, _LW -from neutron.openstack.common import uuidutils from neutron.plugins.vmware.extensions import ( advancedserviceproviders as as_providers) from neutron.plugins.vmware.extensions import ( diff --git a/vmware_nsx/neutron/plugins/vmware/vshield/edge_utils.py b/vmware_nsx/neutron/plugins/vmware/vshield/edge_utils.py index d47be233d5..60c9b413be 100644 --- a/vmware_nsx/neutron/plugins/vmware/vshield/edge_utils.py +++ b/vmware_nsx/neutron/plugins/vmware/vshield/edge_utils.py @@ -20,13 +20,13 @@ from oslo_concurrency import lockutils from oslo_config import cfg from oslo_log import log as logging from oslo_utils import excutils +from oslo_utils import uuidutils from sqlalchemy.orm import exc as sa_exc from neutron.common import exceptions as n_exc from neutron import context as q_context from neutron.extensions import l3 from neutron.i18n import _LE, _LW -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants as plugin_const from vmware_nsx.neutron.plugins.vmware.common import nsxv_constants from vmware_nsx.neutron.plugins.vmware.dbexts import db as nsx_db diff --git a/vmware_nsx/neutron/tests/unit/vmware/apiclient/fake.py b/vmware_nsx/neutron/tests/unit/vmware/apiclient/fake.py index 814c508692..5eaae0b5b0 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/apiclient/fake.py +++ b/vmware_nsx/neutron/tests/unit/vmware/apiclient/fake.py @@ -14,9 +14,9 @@ from oslo_log import log as logging from oslo_serialization import jsonutils +from oslo_utils import uuidutils import six.moves.urllib.parse as urlparse -from neutron.openstack.common import uuidutils from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc diff --git a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_vnic_index.py b/vmware_nsx/neutron/tests/unit/vmware/extensions/test_vnic_index.py index c2cd069ec1..8dea57b651 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/extensions/test_vnic_index.py +++ b/vmware_nsx/neutron/tests/unit/vmware/extensions/test_vnic_index.py @@ -15,12 +15,12 @@ from oslo_config import cfg from oslo_db import exception as d_exc +from oslo_utils import uuidutils from neutron.api.v2 import attributes as attr from neutron import context as neutron_context from neutron.db import db_base_plugin_v2 from neutron import manager -from neutron.openstack.common import uuidutils from neutron.plugins.vmware.extensions import vnicindex as vnicidx from neutron.tests.unit import test_db_plugin from vmware_nsx.neutron.plugins.vmware.dbexts import vnic_index_db diff --git a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_router.py b/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_router.py index 1510cae779..70782d52d7 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_router.py +++ b/vmware_nsx/neutron/tests/unit/vmware/nsxlib/test_router.py @@ -15,12 +15,10 @@ # import mock - -from oslo_config import cfg - from neutron.common import exceptions -from neutron.openstack.common import uuidutils from neutron.tests.unit import test_api_v2 +from oslo_config import cfg +from oslo_utils import uuidutils from vmware_nsx.neutron.plugins.vmware.api_client import exception as api_exc from vmware_nsx.neutron.plugins.vmware.api_client import version as ver_module diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_dvs.py b/vmware_nsx/neutron/tests/unit/vmware/test_dvs.py index b7debce35c..ad98a6f312 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/test_dvs.py +++ b/vmware_nsx/neutron/tests/unit/vmware/test_dvs.py @@ -16,12 +16,12 @@ import contextlib import mock from oslo_config import cfg +from oslo_utils import uuidutils from neutron.common import exceptions as exp from neutron import context from neutron.extensions import portbindings from neutron import manager -from neutron.openstack.common import uuidutils from neutron.tests import base import neutron.tests.unit.test_db_plugin as test_plugin from vmware_nsx.neutron.plugins.vmware.common import exceptions as nsx_exc diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_opts.py b/vmware_nsx/neutron/tests/unit/vmware/test_nsx_opts.py index 833f42c79a..0538f49663 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_opts.py +++ b/vmware_nsx/neutron/tests/unit/vmware/test_nsx_opts.py @@ -17,9 +17,9 @@ import fixtures import mock from oslo_config import cfg +from oslo_utils import uuidutils from neutron import manager -from neutron.openstack.common import uuidutils from neutron.tests import base from vmware_nsx.neutron.plugins.vmware.api_client import client from vmware_nsx.neutron.plugins.vmware.api_client import version diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_plugin.py b/vmware_nsx/neutron/tests/unit/vmware/test_nsx_plugin.py index 48ef01d721..8f6a8a6dca 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_plugin.py +++ b/vmware_nsx/neutron/tests/unit/vmware/test_nsx_plugin.py @@ -21,6 +21,7 @@ import netaddr from oslo_config import cfg from oslo_db import exception as db_exc from oslo_log import log +from oslo_utils import uuidutils from sqlalchemy import exc as sql_exc import webob.exc @@ -37,7 +38,6 @@ from neutron.extensions import portbindings from neutron.extensions import providernet as pnet from neutron.extensions import securitygroup as secgrp from neutron import manager -from neutron.openstack.common import uuidutils from neutron.tests.unit import _test_extension_portbindings as test_bindings import neutron.tests.unit.test_db_plugin as test_plugin import neutron.tests.unit.test_extension_ext_gw_mode as test_ext_gw_mode diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_utils.py b/vmware_nsx/neutron/tests/unit/vmware/test_nsx_utils.py index cc10ab00cc..95ae3f13d9 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_utils.py +++ b/vmware_nsx/neutron/tests/unit/vmware/test_nsx_utils.py @@ -17,9 +17,9 @@ import mock from neutron.db import api as db_api from neutron.extensions import multiprovidernet as mpnet from neutron.extensions import providernet as pnet -from neutron.openstack.common import uuidutils from neutron.plugins.vmware.dbexts import nsx_models from neutron.tests import base +from oslo_utils import uuidutils 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 diff --git a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_v_plugin.py b/vmware_nsx/neutron/tests/unit/vmware/test_nsx_v_plugin.py index 02f3a8e1b9..3b0bbb8715 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/test_nsx_v_plugin.py +++ b/vmware_nsx/neutron/tests/unit/vmware/test_nsx_v_plugin.py @@ -18,6 +18,7 @@ from eventlet import greenthread import mock from oslo_config import cfg from oslo_db import exception as db_exc +from oslo_utils import uuidutils import webob.exc from neutron.api.v2 import attributes @@ -35,7 +36,6 @@ from neutron.extensions import portsecurity as psec from neutron.extensions import providernet as pnet from neutron.extensions import securitygroup as secgrp from neutron import manager -from neutron.openstack.common import uuidutils from neutron.plugins.vmware.extensions import ( vnicindex as ext_vnic_idx) from neutron.plugins.vmware.extensions import routertype as router_type diff --git a/vmware_nsx/neutron/tests/unit/vmware/vshield/fake_vcns.py b/vmware_nsx/neutron/tests/unit/vmware/vshield/fake_vcns.py index a1e2550e62..1d041976ec 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/vshield/fake_vcns.py +++ b/vmware_nsx/neutron/tests/unit/vmware/vshield/fake_vcns.py @@ -15,9 +15,9 @@ import copy from oslo_serialization import jsonutils +from oslo_utils import uuidutils import xml.etree.ElementTree as ET -from neutron.openstack.common import uuidutils from vmware_nsx.neutron.plugins.vmware.vshield.common import exceptions SECTION_LOCATION_HEADER = '/api/4.0/firewall/globalroot-0/config/%s/%s' diff --git a/vmware_nsx/neutron/tests/unit/vmware/vshield/test_edge_utils.py b/vmware_nsx/neutron/tests/unit/vmware/vshield/test_edge_utils.py index e81896668b..6ba64ebb6b 100644 --- a/vmware_nsx/neutron/tests/unit/vmware/vshield/test_edge_utils.py +++ b/vmware_nsx/neutron/tests/unit/vmware/vshield/test_edge_utils.py @@ -15,10 +15,10 @@ import mock from oslo_config import cfg +from oslo_utils import uuidutils from neutron.common import exceptions as n_exc from neutron import context -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants as plugin_const from neutron.tests.unit import testlib_api from vmware_nsx.neutron.plugins.vmware.common import nsxv_constants