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
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__)
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__)
import netaddr
from oslo_log import log as logging
+from oslo_utils import uuidutils
import six
from neutron.agent.common import ovs_lib
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
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
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
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
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__)
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
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__)
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
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
# 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):
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
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__)
import netaddr
from oslo_config import cfg
+from oslo_utils import uuidutils
import six
from neutron.api import extensions
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
# 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
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
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__)
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
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):
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
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__)
+++ /dev/null
-# 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
# 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
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
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
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
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
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)
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
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
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
# 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
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
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
# 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
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
# 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
# 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
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
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
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
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
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
# 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
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
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
# 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
# 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
# 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
# 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
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
# under the License.
import mock
+from oslo_utils import uuidutils
from neutron.agent.common import config
from neutron.agent.common import ovs_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
# 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
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
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
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
# 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
# limitations under the License.
import mock
+from oslo_utils import uuidutils
from neutron.common import constants as l3_const
from neutron.common import exceptions
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
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
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
# 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
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
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
import mock
from oslo_log import log as logging
+from oslo_utils import uuidutils
import testtools
from webob import exc
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
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
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
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
import mock
from oslo_config import cfg
+from oslo_utils import uuidutils
import testscenarios
from webob import exc
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
import mock
from oslo_config import cfg
+from oslo_utils import uuidutils
from webob import exc as web_exc
import webtest
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
# 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
import netaddr
from oslo_config import cfg
+from oslo_utils import uuidutils
from neutron.api.v2 import attributes
from neutron.common import constants
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
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
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
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
# limitations under the License.
import mock
-
+from oslo_utils import uuidutils
from sqlalchemy.orm import query
from neutron import context
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
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
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
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
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
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
# under the License.
import mock
+from oslo_utils import uuidutils
from neutron.api.v2 import attributes as attr
from neutron import context
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
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()
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()
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
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
Code Review / openstack-build / neutron-build.git / commitdiff