From c3d65a0ed920110223e1b73d6982968552ca7716 Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Tue, 3 Mar 2015 17:08:48 +0800 Subject: [PATCH] Switch to oslo_utils.uuidutils Get rid of oslo-incubator uuidutils Closes-Bug: #1467020 Depends-On: I2df519965883b05d5d58cdc4785c850b0685dc2c Depends-On: I9f8e98ad9517864a9ffdacf01c0a9a5aab554edb Depends-On: Ied0faac809a5b72b1cd466c8babc9ca5418692c3 Change-Id: Iebe491b981b4b7c02785412fadd27678bb5e47de --- neutron/agent/linux/dhcp.py | 2 +- neutron/api/v2/attributes.py | 2 +- neutron/cmd/sanity/checks.py | 2 +- neutron/db/db_base_plugin_v2.py | 2 +- neutron/db/l3_db.py | 2 +- neutron/db/metering/metering_db.py | 2 +- ...0a332_remove_hypervneutronplugin_tables.py | 2 +- neutron/db/migration/migrate_to_ml2.py | 2 +- neutron/db/models_v2.py | 2 +- neutron/db/securitygroups_db.py | 3 +- neutron/extensions/securitygroup.py | 2 +- neutron/ipam/drivers/neutrondb_ipam/db_api.py | 2 +- neutron/ipam/drivers/neutrondb_ipam/driver.py | 2 +- neutron/ipam/subnet_alloc.py | 3 +- neutron/notifiers/nova.py | 2 +- neutron/openstack/common/uuidutils.py | 37 ------------------- neutron/plugins/cisco/db/network_db_v2.py | 2 +- .../plugins/cisco/n1kv/n1kv_neutron_plugin.py | 2 +- neutron/plugins/ml2/db.py | 2 +- .../ml2/drivers/cisco/n1kv/n1kv_ext_driver.py | 2 +- neutron/plugins/ml2/plugin.py | 2 +- neutron/plugins/nec/nec_plugin.py | 1 - neutron/tests/common/l3_test_common.py | 2 +- neutron/tests/common/net_helpers.py | 2 +- neutron/tests/fullstack/test_l3_agent.py | 3 +- .../agent/l3/test_keepalived_state_change.py | 2 +- .../agent/l3/test_namespace_manager.py | 2 +- .../functional/agent/linux/test_interface.py | 2 +- .../tests/functional/agent/test_l3_agent.py | 2 +- .../tests/unit/agent/common/test_ovs_lib.py | 2 +- neutron/tests/unit/agent/l3/test_agent.py | 2 +- .../tests/unit/agent/l3/test_dvr_fip_ns.py | 2 +- .../unit/agent/l3/test_dvr_local_router.py | 2 +- neutron/tests/unit/agent/l3/test_ha_router.py | 2 +- .../tests/unit/agent/l3/test_legacy_router.py | 2 +- .../unit/agent/l3/test_namespace_manager.py | 2 +- .../tests/unit/agent/l3/test_router_info.py | 2 +- .../agent/l3/test_router_processing_queue.py | 3 +- .../tests/unit/agent/linux/test_interface.py | 2 +- .../tests/unit/agent/metadata/test_driver.py | 3 +- neutron/tests/unit/api/v2/test_base.py | 2 +- neutron/tests/unit/cmd/test_ovs_cleanup.py | 3 +- neutron/tests/unit/db/test_l3_dvr_db.py | 2 +- neutron/tests/unit/db/test_l3_hamode_db.py | 2 +- neutron/tests/unit/dummy_plugin.py | 3 +- neutron/tests/unit/extensions/test_agent.py | 2 +- .../unit/extensions/test_external_net.py | 2 +- .../tests/unit/extensions/test_extraroute.py | 2 +- neutron/tests/unit/extensions/test_l3.py | 2 +- .../unit/extensions/test_l3_ext_gw_mode.py | 2 +- .../tests/unit/extensions/test_providernet.py | 2 +- .../drivers/neutrondb_ipam/test_db_api.py | 3 +- neutron/tests/unit/ipam/test_subnet_alloc.py | 2 +- neutron/tests/unit/notifiers/test_nova.py | 2 +- .../tests/unit/plugins/ibm/test_sdnve_api.py | 2 +- neutron/tests/unit/plugins/ml2/test_db.py | 3 +- neutron/tests/unit/plugins/ml2/test_plugin.py | 2 +- .../openvswitch/test_agent_scheduler.py | 2 +- .../metering/agents/test_metering_agent.py | 2 +- .../services/metering/test_metering_plugin.py | 6 +-- neutron/tests/unit/test_ipam.py | 2 +- 61 files changed, 68 insertions(+), 101 deletions(-) delete mode 100644 neutron/openstack/common/uuidutils.py diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py index 084a67d4171..d4d2ba6c001 100644 --- a/neutron/agent/linux/dhcp.py +++ b/neutron/agent/linux/dhcp.py @@ -24,6 +24,7 @@ import netaddr from oslo_config import cfg from oslo_log import log as logging from oslo_utils import importutils +from oslo_utils import uuidutils import six from neutron.agent.linux import external_process @@ -36,7 +37,6 @@ from neutron.common import ipv6_utils from neutron.common import utils as commonutils from neutron.extensions import extra_dhcp_opt as edo_ext from neutron.i18n import _LE, _LI, _LW -from neutron.openstack.common import uuidutils LOG = logging.getLogger(__name__) diff --git a/neutron/api/v2/attributes.py b/neutron/api/v2/attributes.py index 7bd61fa73aa..64a45e89105 100644 --- a/neutron/api/v2/attributes.py +++ b/neutron/api/v2/attributes.py @@ -17,11 +17,11 @@ import re import netaddr from oslo_log import log as logging +from oslo_utils import uuidutils import six from neutron.common import constants from neutron.common import exceptions as n_exc -from neutron.openstack.common import uuidutils LOG = logging.getLogger(__name__) diff --git a/neutron/cmd/sanity/checks.py b/neutron/cmd/sanity/checks.py index c31f5777dd0..5c09b461c23 100644 --- a/neutron/cmd/sanity/checks.py +++ b/neutron/cmd/sanity/checks.py @@ -17,6 +17,7 @@ import re import netaddr from oslo_log import log as logging +from oslo_utils import uuidutils import six from neutron.agent.common import ovs_lib @@ -25,7 +26,6 @@ from neutron.agent.linux import ip_link_support from neutron.agent.linux import utils as agent_utils from neutron.common import utils from neutron.i18n import _LE -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants as const from neutron.plugins.openvswitch.common import constants as ovs_const diff --git a/neutron/db/db_base_plugin_v2.py b/neutron/db/db_base_plugin_v2.py index f4a92157461..c9bff5012bc 100644 --- a/neutron/db/db_base_plugin_v2.py +++ b/neutron/db/db_base_plugin_v2.py @@ -19,6 +19,7 @@ from oslo_db import api as oslo_db_api from oslo_db import exception as db_exc from oslo_log import log as logging from oslo_utils import excutils +from oslo_utils import uuidutils from sqlalchemy import and_ from sqlalchemy import event @@ -42,7 +43,6 @@ from neutron import ipam from neutron.ipam import subnet_alloc from neutron import manager from neutron import neutron_plugin_base_v2 -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants as service_constants diff --git a/neutron/db/l3_db.py b/neutron/db/l3_db.py index 8f8f70b86e9..cf31b831cb8 100644 --- a/neutron/db/l3_db.py +++ b/neutron/db/l3_db.py @@ -14,6 +14,7 @@ import netaddr from oslo_log import log as logging +from oslo_utils import uuidutils import sqlalchemy as sa from sqlalchemy import orm from sqlalchemy.orm import exc @@ -37,7 +38,6 @@ from neutron.extensions import external_net from neutron.extensions import l3 from neutron.i18n import _LI, _LE from neutron import manager -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants LOG = logging.getLogger(__name__) diff --git a/neutron/db/metering/metering_db.py b/neutron/db/metering/metering_db.py index dec910284d5..2e7f9c372fe 100644 --- a/neutron/db/metering/metering_db.py +++ b/neutron/db/metering/metering_db.py @@ -14,6 +14,7 @@ import netaddr from oslo_log import log as logging +from oslo_utils import uuidutils import sqlalchemy as sa from sqlalchemy import orm from sqlalchemy import sql @@ -25,7 +26,6 @@ from neutron.db import l3_db from neutron.db import model_base from neutron.db import models_v2 from neutron.extensions import metering -from neutron.openstack.common import uuidutils LOG = logging.getLogger(__name__) diff --git a/neutron/db/migration/alembic_migrations/versions/2b801560a332_remove_hypervneutronplugin_tables.py b/neutron/db/migration/alembic_migrations/versions/2b801560a332_remove_hypervneutronplugin_tables.py index 711ebe05e3e..6df244cdc0d 100644 --- a/neutron/db/migration/alembic_migrations/versions/2b801560a332_remove_hypervneutronplugin_tables.py +++ b/neutron/db/migration/alembic_migrations/versions/2b801560a332_remove_hypervneutronplugin_tables.py @@ -32,11 +32,11 @@ revision = '2b801560a332' down_revision = '2d2a8a565438' from alembic import op +from oslo_utils import uuidutils import sqlalchemy as sa from sqlalchemy.sql import expression as sa_expr from neutron.extensions import portbindings -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants as p_const FLAT_VLAN_ID = -1 diff --git a/neutron/db/migration/migrate_to_ml2.py b/neutron/db/migration/migrate_to_ml2.py index e1b9579bcd5..1ca0391051f 100755 --- a/neutron/db/migration/migrate_to_ml2.py +++ b/neutron/db/migration/migrate_to_ml2.py @@ -61,10 +61,10 @@ To manually test migration from ovs to ml2 with devstack: import argparse from oslo_db.sqlalchemy import session +from oslo_utils import uuidutils import sqlalchemy as sa from neutron.extensions import portbindings -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants as p_const diff --git a/neutron/db/models_v2.py b/neutron/db/models_v2.py index a93676198db..606207a7de9 100644 --- a/neutron/db/models_v2.py +++ b/neutron/db/models_v2.py @@ -13,13 +13,13 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_utils import uuidutils import sqlalchemy as sa from sqlalchemy import orm from neutron.api.v2 import attributes as attr from neutron.common import constants from neutron.db import model_base -from neutron.openstack.common import uuidutils class HasTenant(object): diff --git a/neutron/db/securitygroups_db.py b/neutron/db/securitygroups_db.py index 3caca9bbc91..0fe0ef2176d 100644 --- a/neutron/db/securitygroups_db.py +++ b/neutron/db/securitygroups_db.py @@ -15,6 +15,7 @@ import netaddr from oslo_db import exception from oslo_log import log as logging +from oslo_utils import uuidutils import sqlalchemy as sa from sqlalchemy import orm from sqlalchemy.orm import exc @@ -31,7 +32,7 @@ from neutron.db import db_base_plugin_v2 from neutron.db import model_base from neutron.db import models_v2 from neutron.extensions import securitygroup as ext_sg -from neutron.openstack.common import uuidutils + LOG = logging.getLogger(__name__) diff --git a/neutron/extensions/securitygroup.py b/neutron/extensions/securitygroup.py index cff13351b27..01609905b90 100644 --- a/neutron/extensions/securitygroup.py +++ b/neutron/extensions/securitygroup.py @@ -17,6 +17,7 @@ import abc import netaddr from oslo_config import cfg +from oslo_utils import uuidutils import six from neutron.api import extensions @@ -25,7 +26,6 @@ from neutron.api.v2 import base from neutron.common import constants as const from neutron.common import exceptions as nexception from neutron import manager -from neutron.openstack.common import uuidutils from neutron import quota diff --git a/neutron/ipam/drivers/neutrondb_ipam/db_api.py b/neutron/ipam/drivers/neutrondb_ipam/db_api.py index 0f8cf1f57c0..188d55990b0 100644 --- a/neutron/ipam/drivers/neutrondb_ipam/db_api.py +++ b/neutron/ipam/drivers/neutrondb_ipam/db_api.py @@ -14,9 +14,9 @@ # under the License. from oslo_log import log +from oslo_utils import uuidutils from neutron.ipam.drivers.neutrondb_ipam import db_models -from neutron.openstack.common import uuidutils LOG = log.getLogger(__name__) # Database operations for Neutron's DB-backed IPAM driver diff --git a/neutron/ipam/drivers/neutrondb_ipam/driver.py b/neutron/ipam/drivers/neutrondb_ipam/driver.py index d1002827c57..2783dea1b91 100644 --- a/neutron/ipam/drivers/neutrondb_ipam/driver.py +++ b/neutron/ipam/drivers/neutrondb_ipam/driver.py @@ -15,6 +15,7 @@ import netaddr from oslo_log import log +from oslo_utils import uuidutils from neutron.common import exceptions as n_exc from neutron.common import ipv6_utils @@ -27,7 +28,6 @@ from neutron.ipam import exceptions as ipam_exc from neutron.ipam import subnet_alloc from neutron.ipam import utils as ipam_utils from neutron import manager -from neutron.openstack.common import uuidutils LOG = log.getLogger(__name__) diff --git a/neutron/ipam/subnet_alloc.py b/neutron/ipam/subnet_alloc.py index dc38f43752a..1315d55792c 100644 --- a/neutron/ipam/subnet_alloc.py +++ b/neutron/ipam/subnet_alloc.py @@ -17,6 +17,8 @@ import math import operator import netaddr +from oslo_utils import uuidutils + from neutron.api.v2 import attributes from neutron.common import constants from neutron.common import exceptions as n_exc @@ -24,7 +26,6 @@ from neutron.db import models_v2 import neutron.ipam as ipam from neutron.ipam import driver from neutron.ipam import utils as ipam_utils -from neutron.openstack.common import uuidutils class SubnetAllocator(driver.Pool): diff --git a/neutron/notifiers/nova.py b/neutron/notifiers/nova.py index 4bad6dcbadd..f902b2b62df 100644 --- a/neutron/notifiers/nova.py +++ b/neutron/notifiers/nova.py @@ -21,6 +21,7 @@ from novaclient import exceptions as nova_exceptions from oslo_config import cfg from oslo_log import log as logging from oslo_utils import importutils +from oslo_utils import uuidutils from sqlalchemy.orm import attributes as sql_attr from neutron.common import constants @@ -28,7 +29,6 @@ from neutron import context from neutron.i18n import _LE, _LI, _LW from neutron import manager from neutron.notifiers import batch_notifier -from neutron.openstack.common import uuidutils LOG = logging.getLogger(__name__) diff --git a/neutron/openstack/common/uuidutils.py b/neutron/openstack/common/uuidutils.py deleted file mode 100644 index 234b880c999..00000000000 --- a/neutron/openstack/common/uuidutils.py +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2012 Intel Corporation. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -""" -UUID related utilities and helper functions. -""" - -import uuid - - -def generate_uuid(): - return str(uuid.uuid4()) - - -def is_uuid_like(val): - """Returns validation of a value as a UUID. - - For our purposes, a UUID is a canonical form string: - aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa - - """ - try: - return str(uuid.UUID(val)) == val - except (TypeError, ValueError, AttributeError): - return False diff --git a/neutron/plugins/cisco/db/network_db_v2.py b/neutron/plugins/cisco/db/network_db_v2.py index dab2e071a32..15aeabf4c9e 100644 --- a/neutron/plugins/cisco/db/network_db_v2.py +++ b/neutron/plugins/cisco/db/network_db_v2.py @@ -13,10 +13,10 @@ # under the License. from oslo_log import log as logging +from oslo_utils import uuidutils from sqlalchemy.orm import exc from neutron.db import api as db -from neutron.openstack.common import uuidutils from neutron.plugins.cisco.common import cisco_constants as const from neutron.plugins.cisco.common import cisco_exceptions as c_exc from neutron.plugins.cisco.db import network_models_v2 diff --git a/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py b/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py index d0b5f2549c3..9d4e5bd683c 100644 --- a/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py +++ b/neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py @@ -17,6 +17,7 @@ from oslo_config import cfg as q_conf from oslo_log import log as logging from oslo_utils import excutils from oslo_utils import importutils +from oslo_utils import uuidutils from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api from neutron.api.rpc.handlers import dhcp_rpc @@ -36,7 +37,6 @@ from neutron.extensions import portbindings from neutron.extensions import providernet from neutron.i18n import _LW from neutron import manager -from neutron.openstack.common import uuidutils as uuidutils from neutron.plugins.cisco.common import cisco_constants as c_const from neutron.plugins.cisco.common import cisco_credentials_v2 as c_cred from neutron.plugins.cisco.common import cisco_exceptions diff --git a/neutron/plugins/ml2/db.py b/neutron/plugins/ml2/db.py index fc4b50434de..385167d40da 100644 --- a/neutron/plugins/ml2/db.py +++ b/neutron/plugins/ml2/db.py @@ -15,6 +15,7 @@ from oslo_db import exception as db_exc from oslo_log import log +from oslo_utils import uuidutils import six from sqlalchemy import or_ from sqlalchemy.orm import exc @@ -25,7 +26,6 @@ from neutron.db import securitygroups_db as sg_db from neutron.extensions import portbindings from neutron.i18n import _LE, _LI from neutron import manager -from neutron.openstack.common import uuidutils from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2 import models diff --git a/neutron/plugins/ml2/drivers/cisco/n1kv/n1kv_ext_driver.py b/neutron/plugins/ml2/drivers/cisco/n1kv/n1kv_ext_driver.py index eb118c99862..9fc6ec9fdfa 100644 --- a/neutron/plugins/ml2/drivers/cisco/n1kv/n1kv_ext_driver.py +++ b/neutron/plugins/ml2/drivers/cisco/n1kv/n1kv_ext_driver.py @@ -17,6 +17,7 @@ from oslo_config import cfg from oslo_log import log +from oslo_utils import uuidutils from networking_cisco.plugins.ml2.drivers.cisco.n1kv import ( constants) @@ -28,7 +29,6 @@ from networking_cisco.plugins.ml2.drivers.cisco.n1kv import ( from neutron.api import extensions as api_extensions from neutron.api.v2 import attributes from neutron.i18n import _LE -from neutron.openstack.common import uuidutils from neutron.plugins.ml2.common import exceptions as ml2_exc from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2.drivers.cisco.n1kv import extensions diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index ba8054b9989..577c37f7dcf 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -22,6 +22,7 @@ from oslo_log import log from oslo_serialization import jsonutils from oslo_utils import excutils from oslo_utils import importutils +from oslo_utils import uuidutils from sqlalchemy import exc as sql_exc from sqlalchemy.orm import exc as sa_exc @@ -64,7 +65,6 @@ from neutron.extensions import providernet as provider from neutron.extensions import vlantransparent from neutron.i18n import _LE, _LI, _LW from neutron import manager -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants as service_constants from neutron.plugins.ml2.common import exceptions as ml2_exc from neutron.plugins.ml2 import config # noqa diff --git a/neutron/plugins/nec/nec_plugin.py b/neutron/plugins/nec/nec_plugin.py index 449bb9b0c17..c434c711d9b 100644 --- a/neutron/plugins/nec/nec_plugin.py +++ b/neutron/plugins/nec/nec_plugin.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. - from networking_nec.plugins.openflow import plugin from neutron.plugins.nec import config as nec_config diff --git a/neutron/tests/common/l3_test_common.py b/neutron/tests/common/l3_test_common.py index 7345d95cf7c..2cb66d4deea 100644 --- a/neutron/tests/common/l3_test_common.py +++ b/neutron/tests/common/l3_test_common.py @@ -14,10 +14,10 @@ import copy import netaddr +from oslo_utils import uuidutils from six import moves from neutron.common import constants as l3_constants -from neutron.openstack.common import uuidutils _uuid = uuidutils.generate_uuid diff --git a/neutron/tests/common/net_helpers.py b/neutron/tests/common/net_helpers.py index 33dbc4ee6c9..cddf86a748c 100644 --- a/neutron/tests/common/net_helpers.py +++ b/neutron/tests/common/net_helpers.py @@ -17,13 +17,13 @@ import abc import fixtures import netaddr +from oslo_utils import uuidutils import six from neutron.agent.common import ovs_lib from neutron.agent.linux import bridge_lib from neutron.agent.linux import ip_lib from neutron.common import constants as n_const -from neutron.openstack.common import uuidutils from neutron.tests import base as tests_base from neutron.tests.common import base as common_base from neutron.tests import tools diff --git a/neutron/tests/fullstack/test_l3_agent.py b/neutron/tests/fullstack/test_l3_agent.py index 4bf86308bb9..e7a37457efb 100644 --- a/neutron/tests/fullstack/test_l3_agent.py +++ b/neutron/tests/fullstack/test_l3_agent.py @@ -12,11 +12,12 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_utils import uuidutils + from neutron.agent.l3 import agent as l3_agent from neutron.agent.l3 import namespaces from neutron.agent.linux import ip_lib from neutron.agent.linux import utils -from neutron.openstack.common import uuidutils from neutron.tests.fullstack import base from neutron.tests.fullstack import fullstack_fixtures as f_fixtures diff --git a/neutron/tests/functional/agent/l3/test_keepalived_state_change.py b/neutron/tests/functional/agent/l3/test_keepalived_state_change.py index b87b504e86c..8c781129de7 100644 --- a/neutron/tests/functional/agent/l3/test_keepalived_state_change.py +++ b/neutron/tests/functional/agent/l3/test_keepalived_state_change.py @@ -16,9 +16,9 @@ import os import mock from oslo_config import cfg +from oslo_utils import uuidutils from neutron.agent.l3 import keepalived_state_change -from neutron.openstack.common import uuidutils from neutron.tests.functional import base diff --git a/neutron/tests/functional/agent/l3/test_namespace_manager.py b/neutron/tests/functional/agent/l3/test_namespace_manager.py index b85e03ba7ad..cec30d7db59 100755 --- a/neutron/tests/functional/agent/l3/test_namespace_manager.py +++ b/neutron/tests/functional/agent/l3/test_namespace_manager.py @@ -14,12 +14,12 @@ # under the License. import mock +from oslo_utils import uuidutils from neutron.agent.l3 import dvr_snat_ns from neutron.agent.l3 import namespace_manager from neutron.agent.l3 import namespaces from neutron.agent.linux import ip_lib -from neutron.openstack.common import uuidutils from neutron.tests.functional import base _uuid = uuidutils.generate_uuid diff --git a/neutron/tests/functional/agent/linux/test_interface.py b/neutron/tests/functional/agent/linux/test_interface.py index 8f7a369e3b8..588341ebfc7 100644 --- a/neutron/tests/functional/agent/linux/test_interface.py +++ b/neutron/tests/functional/agent/linux/test_interface.py @@ -13,13 +13,13 @@ # under the License. from oslo_config import cfg +from oslo_utils import uuidutils import testtools from neutron.agent.linux import interface from neutron.agent.linux import ip_lib from neutron.common import exceptions from neutron.common import utils -from neutron.openstack.common import uuidutils from neutron.tests import base as tests_base from neutron.tests.common import net_helpers from neutron.tests.functional.agent.linux import base diff --git a/neutron/tests/functional/agent/test_l3_agent.py b/neutron/tests/functional/agent/test_l3_agent.py index f2674d82aaa..3e3caa5d496 100644 --- a/neutron/tests/functional/agent/test_l3_agent.py +++ b/neutron/tests/functional/agent/test_l3_agent.py @@ -21,6 +21,7 @@ import mock import netaddr from oslo_config import cfg from oslo_log import log as logging +from oslo_utils import uuidutils import six import testtools import webob @@ -44,7 +45,6 @@ from neutron.callbacks import resources from neutron.common import config as common_config from neutron.common import constants as l3_constants from neutron.common import utils as common_utils -from neutron.openstack.common import uuidutils from neutron.tests.common import l3_test_common from neutron.tests.common import machine_fixtures from neutron.tests.common import net_helpers diff --git a/neutron/tests/unit/agent/common/test_ovs_lib.py b/neutron/tests/unit/agent/common/test_ovs_lib.py index d1bb0c88210..9e9c514dcd8 100644 --- a/neutron/tests/unit/agent/common/test_ovs_lib.py +++ b/neutron/tests/unit/agent/common/test_ovs_lib.py @@ -15,12 +15,12 @@ import collections import mock from oslo_serialization import jsonutils +from oslo_utils import uuidutils import testtools from neutron.agent.common import ovs_lib from neutron.agent.common import utils from neutron.common import exceptions -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants from neutron.tests import base from neutron.tests import tools diff --git a/neutron/tests/unit/agent/l3/test_agent.py b/neutron/tests/unit/agent/l3/test_agent.py index 1c3b62ce88c..cda307279ea 100644 --- a/neutron/tests/unit/agent/l3/test_agent.py +++ b/neutron/tests/unit/agent/l3/test_agent.py @@ -22,6 +22,7 @@ import mock import netaddr from oslo_log import log import oslo_messaging +from oslo_utils import uuidutils from testtools import matchers from neutron.agent.common import config as agent_config @@ -46,7 +47,6 @@ from neutron.common import config as base_config from neutron.common import constants as l3_constants from neutron.common import exceptions as n_exc from neutron.i18n import _LE -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants as p_const from neutron.tests import base from neutron.tests.common import l3_test_common diff --git a/neutron/tests/unit/agent/l3/test_dvr_fip_ns.py b/neutron/tests/unit/agent/l3/test_dvr_fip_ns.py index b6ee852ad83..db3423f6c3e 100644 --- a/neutron/tests/unit/agent/l3/test_dvr_fip_ns.py +++ b/neutron/tests/unit/agent/l3/test_dvr_fip_ns.py @@ -13,11 +13,11 @@ # under the License. import mock +from oslo_utils import uuidutils from neutron.agent.l3 import dvr_fip_ns from neutron.agent.l3 import link_local_allocator as lla from neutron.agent.linux import ip_lib -from neutron.openstack.common import uuidutils from neutron.tests import base _uuid = uuidutils.generate_uuid diff --git a/neutron/tests/unit/agent/l3/test_dvr_local_router.py b/neutron/tests/unit/agent/l3/test_dvr_local_router.py index 1e81c8d4854..76a21d5fe0a 100644 --- a/neutron/tests/unit/agent/l3/test_dvr_local_router.py +++ b/neutron/tests/unit/agent/l3/test_dvr_local_router.py @@ -16,6 +16,7 @@ import mock import netaddr from oslo_log import log +from oslo_utils import uuidutils from neutron.agent.common import config as agent_config from neutron.agent.l3 import agent as l3_agent @@ -32,7 +33,6 @@ from neutron.callbacks import registry from neutron.common import config as base_config from neutron.common import constants as l3_constants from neutron.common import utils as common_utils -from neutron.openstack.common import uuidutils from neutron.tests import base from neutron.tests.common import l3_test_common diff --git a/neutron/tests/unit/agent/l3/test_ha_router.py b/neutron/tests/unit/agent/l3/test_ha_router.py index 7e933fb5304..99a46ade5a1 100644 --- a/neutron/tests/unit/agent/l3/test_ha_router.py +++ b/neutron/tests/unit/agent/l3/test_ha_router.py @@ -13,9 +13,9 @@ # under the License. import mock +from oslo_utils import uuidutils from neutron.agent.l3 import ha_router -from neutron.openstack.common import uuidutils from neutron.tests import base _uuid = uuidutils.generate_uuid diff --git a/neutron/tests/unit/agent/l3/test_legacy_router.py b/neutron/tests/unit/agent/l3/test_legacy_router.py index b34b3cc540a..b900d9a5e5e 100644 --- a/neutron/tests/unit/agent/l3/test_legacy_router.py +++ b/neutron/tests/unit/agent/l3/test_legacy_router.py @@ -13,11 +13,11 @@ # under the License. import mock +from oslo_utils import uuidutils from neutron.agent.l3 import legacy_router from neutron.agent.linux import ip_lib from neutron.common import constants as l3_constants -from neutron.openstack.common import uuidutils from neutron.tests import base _uuid = uuidutils.generate_uuid diff --git a/neutron/tests/unit/agent/l3/test_namespace_manager.py b/neutron/tests/unit/agent/l3/test_namespace_manager.py index 4d219ec2c13..8c5156a464e 100644 --- a/neutron/tests/unit/agent/l3/test_namespace_manager.py +++ b/neutron/tests/unit/agent/l3/test_namespace_manager.py @@ -14,12 +14,12 @@ # under the License. import mock +from oslo_utils import uuidutils from neutron.agent.l3 import dvr_snat_ns from neutron.agent.l3 import namespace_manager from neutron.agent.l3 import namespaces from neutron.agent.linux import ip_lib -from neutron.openstack.common import uuidutils from neutron.tests import base _uuid = uuidutils.generate_uuid diff --git a/neutron/tests/unit/agent/l3/test_router_info.py b/neutron/tests/unit/agent/l3/test_router_info.py index 5e60aa12c8f..557a639291a 100644 --- a/neutron/tests/unit/agent/l3/test_router_info.py +++ b/neutron/tests/unit/agent/l3/test_router_info.py @@ -11,13 +11,13 @@ # under the License. import mock +from oslo_utils import uuidutils from neutron.agent.common import config as agent_config from neutron.agent.l3 import router_info from neutron.agent.linux import ip_lib from neutron.common import constants as l3_constants from neutron.common import exceptions as n_exc -from neutron.openstack.common import uuidutils from neutron.tests import base diff --git a/neutron/tests/unit/agent/l3/test_router_processing_queue.py b/neutron/tests/unit/agent/l3/test_router_processing_queue.py index 0f7bfcdc328..ef5d614602f 100644 --- a/neutron/tests/unit/agent/l3/test_router_processing_queue.py +++ b/neutron/tests/unit/agent/l3/test_router_processing_queue.py @@ -15,8 +15,9 @@ import datetime +from oslo_utils import uuidutils + from neutron.agent.l3 import router_processing_queue as l3_queue -from neutron.openstack.common import uuidutils from neutron.tests import base _uuid = uuidutils.generate_uuid diff --git a/neutron/tests/unit/agent/linux/test_interface.py b/neutron/tests/unit/agent/linux/test_interface.py index 1834524e899..2d6eb286825 100644 --- a/neutron/tests/unit/agent/linux/test_interface.py +++ b/neutron/tests/unit/agent/linux/test_interface.py @@ -14,6 +14,7 @@ # under the License. import mock +from oslo_utils import uuidutils from neutron.agent.common import config from neutron.agent.common import ovs_lib @@ -22,7 +23,6 @@ from neutron.agent.linux import ip_lib from neutron.agent.linux import utils from neutron.common import constants from neutron.extensions import flavor -from neutron.openstack.common import uuidutils from neutron.tests import base diff --git a/neutron/tests/unit/agent/metadata/test_driver.py b/neutron/tests/unit/agent/metadata/test_driver.py index e797f1606c4..5cbfd182f9b 100644 --- a/neutron/tests/unit/agent/metadata/test_driver.py +++ b/neutron/tests/unit/agent/metadata/test_driver.py @@ -14,8 +14,8 @@ # under the License. import mock - from oslo_config import cfg +from oslo_utils import uuidutils from neutron.agent.common import config as agent_config from neutron.agent.l3 import agent as l3_agent @@ -23,7 +23,6 @@ from neutron.agent.l3 import config as l3_config from neutron.agent.l3 import ha as l3_ha_agent from neutron.agent.metadata import config from neutron.agent.metadata import driver as metadata_driver -from neutron.openstack.common import uuidutils from neutron.tests import base diff --git a/neutron/tests/unit/api/v2/test_base.py b/neutron/tests/unit/api/v2/test_base.py index 41cb83ec9eb..eae4dd21b53 100644 --- a/neutron/tests/unit/api/v2/test_base.py +++ b/neutron/tests/unit/api/v2/test_base.py @@ -18,6 +18,7 @@ import os import mock from oslo_config import cfg from oslo_policy import policy as oslo_policy +from oslo_utils import uuidutils import six from six import moves import six.moves.urllib.parse as urlparse @@ -34,7 +35,6 @@ from neutron.api.v2 import router from neutron.common import exceptions as n_exc from neutron import context from neutron import manager -from neutron.openstack.common import uuidutils from neutron import policy from neutron import quota from neutron.tests import base diff --git a/neutron/tests/unit/cmd/test_ovs_cleanup.py b/neutron/tests/unit/cmd/test_ovs_cleanup.py index cb20219c6ce..1123f21c72f 100644 --- a/neutron/tests/unit/cmd/test_ovs_cleanup.py +++ b/neutron/tests/unit/cmd/test_ovs_cleanup.py @@ -14,12 +14,13 @@ # under the License. import itertools + import mock +from oslo_utils import uuidutils from neutron.agent.common import ovs_lib from neutron.agent.linux import ip_lib from neutron.cmd import ovs_cleanup as util -from neutron.openstack.common import uuidutils from neutron.tests import base diff --git a/neutron/tests/unit/db/test_l3_dvr_db.py b/neutron/tests/unit/db/test_l3_dvr_db.py index a37c5205706..3a3335784e1 100644 --- a/neutron/tests/unit/db/test_l3_dvr_db.py +++ b/neutron/tests/unit/db/test_l3_dvr_db.py @@ -14,6 +14,7 @@ # limitations under the License. import mock +from oslo_utils import uuidutils from neutron.common import constants as l3_const from neutron.common import exceptions @@ -21,7 +22,6 @@ from neutron import context from neutron.db import common_db_mixin from neutron.db import l3_dvr_db from neutron import manager -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants as plugin_const from neutron.tests.unit import testlib_api diff --git a/neutron/tests/unit/db/test_l3_hamode_db.py b/neutron/tests/unit/db/test_l3_hamode_db.py index ca918698ac2..851fc3ed17b 100644 --- a/neutron/tests/unit/db/test_l3_hamode_db.py +++ b/neutron/tests/unit/db/test_l3_hamode_db.py @@ -16,6 +16,7 @@ import datetime import mock from oslo_config import cfg from oslo_utils import timeutils +from oslo_utils import uuidutils from neutron.api.v2 import attributes from neutron.common import constants @@ -27,7 +28,6 @@ from neutron.db import l3_hamode_db from neutron.extensions import l3 from neutron.extensions import l3_ext_ha_mode from neutron import manager -from neutron.openstack.common import uuidutils from neutron.scheduler import l3_agent_scheduler from neutron.tests.common import helpers from neutron.tests.unit import testlib_api diff --git a/neutron/tests/unit/dummy_plugin.py b/neutron/tests/unit/dummy_plugin.py index 0e7fcd98f4e..767686881c7 100644 --- a/neutron/tests/unit/dummy_plugin.py +++ b/neutron/tests/unit/dummy_plugin.py @@ -13,13 +13,14 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_utils import uuidutils + from neutron.api import extensions from neutron.api.v2 import base from neutron.common import exceptions from neutron.db import servicetype_db from neutron.extensions import servicetype from neutron import manager -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants from neutron.services import service_base diff --git a/neutron/tests/unit/extensions/test_agent.py b/neutron/tests/unit/extensions/test_agent.py index abc28b9aaf4..ff805b469e3 100644 --- a/neutron/tests/unit/extensions/test_agent.py +++ b/neutron/tests/unit/extensions/test_agent.py @@ -19,6 +19,7 @@ import time from oslo_config import cfg from oslo_log import log as logging from oslo_utils import timeutils +from oslo_utils import uuidutils from webob import exc from neutron.api.v2 import attributes @@ -27,7 +28,6 @@ from neutron import context from neutron.db import agents_db from neutron.db import db_base_plugin_v2 from neutron.extensions import agent -from neutron.openstack.common import uuidutils from neutron.tests.common import helpers from neutron.tests import tools from neutron.tests.unit.api.v2 import test_base diff --git a/neutron/tests/unit/extensions/test_external_net.py b/neutron/tests/unit/extensions/test_external_net.py index 0f68cae38f7..d44f0846b03 100644 --- a/neutron/tests/unit/extensions/test_external_net.py +++ b/neutron/tests/unit/extensions/test_external_net.py @@ -17,6 +17,7 @@ import itertools import mock from oslo_log import log as logging +from oslo_utils import uuidutils import testtools from webob import exc @@ -24,7 +25,6 @@ from neutron import context from neutron.db import models_v2 from neutron.extensions import external_net as external_net from neutron import manager -from neutron.openstack.common import uuidutils from neutron.tests.unit.api.v2 import test_base from neutron.tests.unit.db import test_db_base_plugin_v2 diff --git a/neutron/tests/unit/extensions/test_extraroute.py b/neutron/tests/unit/extensions/test_extraroute.py index 278567f4cff..aba4815db30 100644 --- a/neutron/tests/unit/extensions/test_extraroute.py +++ b/neutron/tests/unit/extensions/test_extraroute.py @@ -15,13 +15,13 @@ from oslo_config import cfg from oslo_log import log as logging +from oslo_utils import uuidutils from webob import exc from neutron.common import constants from neutron.db import extraroute_db from neutron.extensions import extraroute from neutron.extensions import l3 -from neutron.openstack.common import uuidutils from neutron.tests.unit.api.v2 import test_base from neutron.tests.unit.extensions import test_l3 as test_l3 diff --git a/neutron/tests/unit/extensions/test_l3.py b/neutron/tests/unit/extensions/test_l3.py index 52503d7d8de..07bac0696b6 100644 --- a/neutron/tests/unit/extensions/test_l3.py +++ b/neutron/tests/unit/extensions/test_l3.py @@ -22,6 +22,7 @@ import netaddr from oslo_config import cfg from oslo_log import log as logging from oslo_utils import importutils +from oslo_utils import uuidutils from webob import exc from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api @@ -43,7 +44,6 @@ from neutron.extensions import external_net from neutron.extensions import l3 from neutron.extensions import portbindings from neutron import manager -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants as service_constants from neutron.tests import base from neutron.tests.common import helpers diff --git a/neutron/tests/unit/extensions/test_l3_ext_gw_mode.py b/neutron/tests/unit/extensions/test_l3_ext_gw_mode.py index 0d4f7fcc62d..ae811d7ae5f 100644 --- a/neutron/tests/unit/extensions/test_l3_ext_gw_mode.py +++ b/neutron/tests/unit/extensions/test_l3_ext_gw_mode.py @@ -16,6 +16,7 @@ import mock from oslo_config import cfg +from oslo_utils import uuidutils import testscenarios from webob import exc @@ -27,7 +28,6 @@ from neutron.db import l3_gwmode_db from neutron.db import models_v2 from neutron.extensions import l3 from neutron.extensions import l3_ext_gw_mode -from neutron.openstack.common import uuidutils from neutron.tests import base from neutron.tests.unit.db import test_db_base_plugin_v2 from neutron.tests.unit.extensions import test_l3 diff --git a/neutron/tests/unit/extensions/test_providernet.py b/neutron/tests/unit/extensions/test_providernet.py index d17f93909a7..d4b5ceab76d 100644 --- a/neutron/tests/unit/extensions/test_providernet.py +++ b/neutron/tests/unit/extensions/test_providernet.py @@ -15,6 +15,7 @@ import mock from oslo_config import cfg +from oslo_utils import uuidutils from webob import exc as web_exc import webtest @@ -23,7 +24,6 @@ from neutron.api.v2 import router from neutron import context from neutron.extensions import providernet as pnet from neutron import manager -from neutron.openstack.common import uuidutils from neutron import quota from neutron.tests import tools from neutron.tests.unit.api import test_extensions diff --git a/neutron/tests/unit/ipam/drivers/neutrondb_ipam/test_db_api.py b/neutron/tests/unit/ipam/drivers/neutrondb_ipam/test_db_api.py index c632efb978c..5680018159f 100644 --- a/neutron/tests/unit/ipam/drivers/neutrondb_ipam/test_db_api.py +++ b/neutron/tests/unit/ipam/drivers/neutrondb_ipam/test_db_api.py @@ -13,10 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_utils import uuidutils + from neutron import context from neutron.ipam.drivers.neutrondb_ipam import db_api from neutron.ipam.drivers.neutrondb_ipam import db_models -from neutron.openstack.common import uuidutils from neutron.tests.unit import testlib_api diff --git a/neutron/tests/unit/ipam/test_subnet_alloc.py b/neutron/tests/unit/ipam/test_subnet_alloc.py index 25021af2fdc..77aef6e8ec1 100644 --- a/neutron/tests/unit/ipam/test_subnet_alloc.py +++ b/neutron/tests/unit/ipam/test_subnet_alloc.py @@ -15,6 +15,7 @@ import netaddr from oslo_config import cfg +from oslo_utils import uuidutils from neutron.api.v2 import attributes from neutron.common import constants @@ -23,7 +24,6 @@ from neutron import context import neutron.ipam as ipam from neutron.ipam import subnet_alloc from neutron import manager -from neutron.openstack.common import uuidutils from neutron.tests.unit.db import test_db_base_plugin_v2 from neutron.tests.unit import testlib_api diff --git a/neutron/tests/unit/notifiers/test_nova.py b/neutron/tests/unit/notifiers/test_nova.py index 49ccb975ae7..15727b5aec5 100644 --- a/neutron/tests/unit/notifiers/test_nova.py +++ b/neutron/tests/unit/notifiers/test_nova.py @@ -16,6 +16,7 @@ import mock from novaclient import exceptions as nova_exceptions +from oslo_utils import uuidutils from sqlalchemy.orm import attributes as sql_attr from oslo_config import cfg @@ -23,7 +24,6 @@ from oslo_config import cfg from neutron.common import constants from neutron.db import models_v2 from neutron.notifiers import nova -from neutron.openstack.common import uuidutils from neutron.tests import base diff --git a/neutron/tests/unit/plugins/ibm/test_sdnve_api.py b/neutron/tests/unit/plugins/ibm/test_sdnve_api.py index cfde1b58554..22dfcb340c3 100644 --- a/neutron/tests/unit/plugins/ibm/test_sdnve_api.py +++ b/neutron/tests/unit/plugins/ibm/test_sdnve_api.py @@ -16,8 +16,8 @@ import mock +from oslo_utils import uuidutils -from neutron.openstack.common import uuidutils from neutron.plugins.ibm.common import constants from neutron.plugins.ibm import sdnve_api from neutron.tests import base diff --git a/neutron/tests/unit/plugins/ml2/test_db.py b/neutron/tests/unit/plugins/ml2/test_db.py index db2c123376f..3e2fe404593 100644 --- a/neutron/tests/unit/plugins/ml2/test_db.py +++ b/neutron/tests/unit/plugins/ml2/test_db.py @@ -14,7 +14,7 @@ # limitations under the License. import mock - +from oslo_utils import uuidutils from sqlalchemy.orm import query from neutron import context @@ -22,7 +22,6 @@ from neutron.db import db_base_plugin_v2 from neutron.db import l3_db from neutron.db import models_v2 from neutron.extensions import portbindings -from neutron.openstack.common import uuidutils from neutron.plugins.ml2 import db as ml2_db from neutron.plugins.ml2 import driver_api as api from neutron.plugins.ml2 import models diff --git a/neutron/tests/unit/plugins/ml2/test_plugin.py b/neutron/tests/unit/plugins/ml2/test_plugin.py index 6684fc40cfb..7fed9d586e4 100644 --- a/neutron/tests/unit/plugins/ml2/test_plugin.py +++ b/neutron/tests/unit/plugins/ml2/test_plugin.py @@ -22,6 +22,7 @@ import webob import fixtures from oslo_db import exception as db_exc +from oslo_utils import uuidutils from sqlalchemy.orm import exc as sqla_exc from neutron.callbacks import registry @@ -38,7 +39,6 @@ from neutron.extensions import multiprovidernet as mpnet from neutron.extensions import portbindings from neutron.extensions import providernet as pnet from neutron import manager -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants as p_const from neutron.plugins.ml2.common import exceptions as ml2_exc from neutron.plugins.ml2 import config diff --git a/neutron/tests/unit/plugins/openvswitch/test_agent_scheduler.py b/neutron/tests/unit/plugins/openvswitch/test_agent_scheduler.py index 5f14037fd0e..dc406d800b2 100644 --- a/neutron/tests/unit/plugins/openvswitch/test_agent_scheduler.py +++ b/neutron/tests/unit/plugins/openvswitch/test_agent_scheduler.py @@ -19,6 +19,7 @@ import mock from oslo_config import cfg from oslo_db import exception as db_exc import oslo_messaging +from oslo_utils import uuidutils from webob import exc from neutron.api import extensions @@ -35,7 +36,6 @@ from neutron.extensions import agent from neutron.extensions import dhcpagentscheduler from neutron.extensions import l3agentscheduler from neutron import manager -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants as service_constants from neutron.tests.common import helpers from neutron.tests import fake_notifier diff --git a/neutron/tests/unit/services/metering/agents/test_metering_agent.py b/neutron/tests/unit/services/metering/agents/test_metering_agent.py index a1c3a2d3a27..9b50dde1e27 100644 --- a/neutron/tests/unit/services/metering/agents/test_metering_agent.py +++ b/neutron/tests/unit/services/metering/agents/test_metering_agent.py @@ -14,8 +14,8 @@ import mock from oslo_config import cfg +from oslo_utils import uuidutils -from neutron.openstack.common import uuidutils from neutron.services.metering.agents import metering_agent from neutron.tests import base from neutron.tests import fake_notifier diff --git a/neutron/tests/unit/services/metering/test_metering_plugin.py b/neutron/tests/unit/services/metering/test_metering_plugin.py index 87de8029768..508117395c8 100644 --- a/neutron/tests/unit/services/metering/test_metering_plugin.py +++ b/neutron/tests/unit/services/metering/test_metering_plugin.py @@ -13,6 +13,7 @@ # under the License. import mock +from oslo_utils import uuidutils from neutron.api.v2 import attributes as attr from neutron import context @@ -22,7 +23,6 @@ from neutron.db.metering import metering_rpc from neutron.extensions import l3 as ext_l3 from neutron.extensions import metering as ext_metering from neutron import manager -from neutron.openstack.common import uuidutils from neutron.plugins.common import constants from neutron.tests.common import helpers from neutron.tests import tools @@ -76,7 +76,7 @@ class TestMeteringPlugin(test_db_base_plugin_v2.NeutronDbPluginV2TestCase, self.uuid = '654f6b9d-0f36-4ae5-bd1b-01616794ca60' - uuid = 'neutron.openstack.common.uuidutils.generate_uuid' + uuid = 'oslo_utils.uuidutils.generate_uuid' self.uuid_patch = mock.patch(uuid, return_value=self.uuid) self.mock_uuid = self.uuid_patch.start() @@ -304,7 +304,7 @@ class TestMeteringPluginL3AgentScheduler( self.uuid = '654f6b9d-0f36-4ae5-bd1b-01616794ca60' - uuid = 'neutron.openstack.common.uuidutils.generate_uuid' + uuid = 'oslo_utils.uuidutils.generate_uuid' self.uuid_patch = mock.patch(uuid, return_value=self.uuid) self.mock_uuid = self.uuid_patch.start() diff --git a/neutron/tests/unit/test_ipam.py b/neutron/tests/unit/test_ipam.py index ffaa100cf52..1dc6e0df62c 100755 --- a/neutron/tests/unit/test_ipam.py +++ b/neutron/tests/unit/test_ipam.py @@ -15,6 +15,7 @@ import types import mock import netaddr from oslo_config import cfg +from oslo_utils import uuidutils from neutron.common import constants from neutron.common import ipv6_utils @@ -23,7 +24,6 @@ from neutron import ipam from neutron.ipam import driver from neutron.ipam import exceptions as ipam_exc from neutron import manager -from neutron.openstack.common import uuidutils from neutron.tests import base from neutron.tests.unit.ipam import fake_driver