From 3498d0da2711a9001f81468febb9f05e93ae8940 Mon Sep 17 00:00:00 2001
From: David Ripton <dripton@redhat.com>
Date: Thu, 15 Nov 2012 16:13:01 -0500
Subject: [PATCH] Do not alias stdlib uuid module as uuidutils, since nova has
 uuidutils.

A few tests use "uuid" as a local variable name, and so must alias the
Python stdlib uuid module to something else.  Unfortunately they chose
"uuidutils", but nova has a module called "uuidutils" so this is confusing.
So change "uuidutils" to "stdlib_uuid" to reduce confusion.

Change-Id: I0b8bad19e37220ef7b2fef1291a3308e481647fe
---
 nova/tests/api/openstack/compute/test_consoles.py | 6 +++---
 nova/tests/api/openstack/compute/test_versions.py | 4 ++--
 nova/tests/test_db_api.py                         | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nova/tests/api/openstack/compute/test_consoles.py b/nova/tests/api/openstack/compute/test_consoles.py
index 413015a4d252..15920d2fbb81 100644
--- a/nova/tests/api/openstack/compute/test_consoles.py
+++ b/nova/tests/api/openstack/compute/test_consoles.py
@@ -17,7 +17,7 @@
 #    under the License.
 
 import datetime
-import uuid as uuidutils
+import uuid as stdlib_uuid
 
 from lxml import etree
 import webob
@@ -58,7 +58,7 @@ class FakeInstanceDB(object):
         if id is None:
             id = self.max_id + 1
         if uuid is None:
-            uuid = str(uuidutils.uuid4())
+            uuid = str(stdlib_uuid.uuid4())
         instance = stub_instance(id, uuid=uuid)
         self.instances_by_id[id] = instance
         self.ids_by_uuid[uuid] = id
@@ -134,7 +134,7 @@ class ConsolesControllerTest(test.TestCase):
                        self.instance_db.return_server_by_id)
         self.stubs.Set(db, 'instance_get_by_uuid',
                        self.instance_db.return_server_by_uuid)
-        self.uuid = str(uuidutils.uuid4())
+        self.uuid = str(stdlib_uuid.uuid4())
         self.url = '/v2/fake/servers/%s/consoles' % self.uuid
         self.controller = consoles.Controller()
 
diff --git a/nova/tests/api/openstack/compute/test_versions.py b/nova/tests/api/openstack/compute/test_versions.py
index 2c05d6d8ab85..16790860c2c6 100644
--- a/nova/tests/api/openstack/compute/test_versions.py
+++ b/nova/tests/api/openstack/compute/test_versions.py
@@ -15,7 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import uuid as uuidutils
+import uuid as stdlib_uuid
 
 import feedparser
 from lxml import etree
@@ -386,7 +386,7 @@ class VersionsTest(test.TestCase):
         self.assertEqual(res.content_type, "application/json")
 
     def test_multi_choice_server(self):
-        uuid = str(uuidutils.uuid4())
+        uuid = str(stdlib_uuid.uuid4())
         req = webob.Request.blank('/servers/' + uuid)
         req.accept = "application/json"
         res = req.get_response(fakes.wsgi_app())
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index 31d1b01b2f4f..92eae023aa9b 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -20,7 +20,7 @@
 """Unit tests for the DB API"""
 
 import datetime
-import uuid as uuidutils
+import uuid as stdlib_uuid
 
 from nova import config
 from nova import context
@@ -146,7 +146,7 @@ class DbApiTestCase(test.TestCase):
         self.assertRaises(exception.MarkerNotFound,
                           db.instance_get_all_by_filters,
                           self.context, {'display_name': '%test%'},
-                          marker=str(uuidutils.uuid4()))
+                          marker=str(stdlib_uuid.uuid4()))
 
     def test_migration_get_unconfirmed_by_dest_compute(self):
         ctxt = context.get_admin_context()
@@ -307,7 +307,7 @@ class DbApiTestCase(test.TestCase):
     def test_instance_fault_create(self):
         """Ensure we can create an instance fault"""
         ctxt = context.get_admin_context()
-        uuid = str(uuidutils.uuid4())
+        uuid = str(stdlib_uuid.uuid4())
 
         # Create a fault
         fault_values = {