Update for uuidutils used from oslo_utils

Neutron repo has removed neutron.openstack.common.uuidutils
See https://review.openstack.org/160699

Partial-Bug: #1467020

Change-Id: I79b26595293a9c035de06b5654d81382d1ea3219

networking_cisco/plugins/cisco/db/l3/device_handling_db.py

@@ -21,6 +21,7 @@ from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import importutils
 from oslo_utils import timeutils
+from oslo_utils import uuidutils
 from sqlalchemy.orm import exc
 from sqlalchemy.orm import joinedload
 
@@ -30,7 +31,6 @@ from neutron import context as neutron_context
 from neutron.db import agents_db
 from neutron.i18n import _LE, _LI, _LW
 from neutron import manager
-from neutron.openstack.common import uuidutils
 from neutron.plugins.cisco.db.l3 import l3_models
 from neutron.plugins.common import constants as svc_constants
 

networking_cisco/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

networking_cisco/plugins/cisco/n1kv/n1kv_neutron_plugin.py

@@ -18,6 +18,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
@@ -38,7 +39,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

networking_cisco/tests/unit/cisco/cfg_agent/test_cfg_agent.py

@@ -14,12 +14,12 @@
 
 import mock
 from oslo_config import cfg
+from oslo_utils import uuidutils
 import testtools
 
 from neutron.agent.common import config
 from neutron.common import config as base_config
 from neutron.common import constants as l3_constants
-from neutron.openstack.common import uuidutils
 from neutron.tests import base
 
 from networking_cisco.plugins.cisco.cfg_agent import cfg_agent

networking_cisco/tests/unit/cisco/cfg_agent/test_csr1kv_routing_driver.py

@@ -16,9 +16,9 @@ import sys
 
 import mock
 import netaddr
+from oslo_utils import uuidutils
 
 from neutron.common import constants as l3_constants
-from neutron.openstack.common import uuidutils
 from neutron.tests import base
 
 from networking_cisco.plugins.cisco.cfg_agent.device_drivers.csr1kv import (

networking_cisco/tests/unit/cisco/cfg_agent/test_device_status.py

@@ -15,8 +15,8 @@ import sys
 
 import datetime
 import mock
+from oslo_utils import uuidutils
 
-from neutron.openstack.common import uuidutils
 
 sys.modules['ncclient'] = mock.MagicMock()
 sys.modules['ciscoconfparse'] = mock.MagicMock()

networking_cisco/tests/unit/cisco/cfg_agent/test_routing_svc_helper.py

@@ -16,10 +16,10 @@ import copy
 import mock
 from oslo_config import cfg
 import oslo_messaging
+from oslo_utils import uuidutils
 
 from neutron.common import config as base_config
 from neutron.common import constants as l3_constants
-from neutron.openstack.common import uuidutils
 from neutron.tests import base
 
 from networking_cisco.plugins.cisco.cfg_agent import cfg_agent

networking_cisco/tests/unit/cisco/l3/device_handling_test_support.py

@@ -17,11 +17,11 @@ from novaclient import exceptions as nova_exc
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
+from oslo_utils import uuidutils
 
 from neutron import context as n_context
 from neutron.i18n import _LE
 from neutron import manager
-from neutron.openstack.common import uuidutils
 from neutron.plugins.common import constants
 
 LOG = logging.getLogger(__name__)