From 5beeed884753c3fb196cb66684d761dfc424b0db Mon Sep 17 00:00:00 2001
From: Zhongyue Luo <zhongyue.nah@intel.com>
Date: Wed, 14 Nov 2012 18:25:59 +0800
Subject: Remove gen_uuid()

Removed gen_uuid and uuid related unittests
Replaced utils.gen_uuid() with uuid.uuid4()

Change-Id: I3020a0d67525eb73cfb8873d2570c93e2022bb76
---
 nova/db/sqlalchemy/api.py                                         | 8 ++++----
 .../migrate_repo/versions/089_add_volume_id_mappings.py           | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'nova/db')

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 42cedc4b2..007e83cbe 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -23,6 +23,7 @@ import collections
 import copy
 import datetime
 import functools
+import uuid
 
 from sqlalchemy import and_
 from sqlalchemy.exc import IntegrityError
@@ -46,7 +47,6 @@ from nova import flags
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova.openstack.common import uuidutils
-from nova import utils
 
 
 CONF = config.CONF
@@ -1344,7 +1344,7 @@ def instance_create(context, values):
 
     instance_ref = models.Instance()
     if not values.get('uuid'):
-        values['uuid'] = str(utils.gen_uuid())
+        values['uuid'] = str(uuid.uuid4())
     instance_ref['info_cache'] = models.InstanceInfoCache()
     info_cache = values.pop('info_cache', None)
     if info_cache is not None:
@@ -2042,7 +2042,7 @@ def network_create_safe(context, values):
             raise exception.DuplicateVlan(vlan=values['vlan'])
 
     network_ref = models.Network()
-    network_ref['uuid'] = str(utils.gen_uuid())
+    network_ref['uuid'] = str(uuid.uuid4())
     network_ref.update(values)
 
     try:
@@ -2643,7 +2643,7 @@ def quota_reserve(context, resources, quotas, deltas, expire,
             reservations = []
             for resource, delta in deltas.items():
                 reservation = reservation_create(elevated,
-                                                 str(utils.gen_uuid()),
+                                                 str(uuid.uuid4()),
                                                  usages[resource],
                                                  context.project_id,
                                                  resource, delta, expire,
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py b/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py
index d878e250b..a4cd06704 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py
@@ -15,11 +15,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import uuid
+
 from sqlalchemy import Boolean, Column, DateTime, Integer
 from sqlalchemy import MetaData, String, Table
 
 from nova.openstack.common import log as logging
-from nova import utils
+
 
 LOG = logging.getLogger(__name__)
 
@@ -93,7 +95,7 @@ def upgrade(migrate_engine):
     volume_list = list(volumes.select().execute())
     for v in volume_list:
         old_id = v['id']
-        new_id = utils.gen_uuid()
+        new_id = uuid.uuid4()
         row = volume_id_mappings.insert()
         row.execute({'id': old_id,
               'uuid': str(new_id)})
@@ -101,7 +103,7 @@ def upgrade(migrate_engine):
     snapshot_list = list(snapshots.select().execute())
     for s in snapshot_list:
         old_id = s['id']
-        new_id = utils.gen_uuid()
+        new_id = uuid.uuid4()
         row = snapshot_id_mappings.insert()
         row.execute({'id': old_id,
               'uuid': str(new_id)})
-- 
cgit