Merge "Use uuidutils from oslo_utils"

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'

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__)
 

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 (

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

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
 
 

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

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

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

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

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

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

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

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'

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