From 34373ca71972e24a4cb0df9aa58cc0dca4e72c17 Mon Sep 17 00:00:00 2001
From: Kiran_totad <kiran.totad@nectechnologies.in>
Date: Tue, 27 Jun 2017 11:28:38 +0530
Subject: [PATCH] Replaces uuid.uuid4 with uuidutils.generate_uuid()

Change-Id: I8ca34402bb5e8944062f2cb27cb840f0a2479dd2
---
 .../functional/key_manager/test_barbican_key_manager.py     | 6 +++---
 castellan/tests/unit/key_manager/mock_key_manager.py        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/castellan/tests/functional/key_manager/test_barbican_key_manager.py b/castellan/tests/functional/key_manager/test_barbican_key_manager.py
index 72a549c4..8fed35c1 100644
--- a/castellan/tests/functional/key_manager/test_barbican_key_manager.py
+++ b/castellan/tests/functional/key_manager/test_barbican_key_manager.py
@@ -19,12 +19,12 @@ Functional test cases for the Barbican key manager.
 Note: This requires local running instances of Barbican and Keystone.
 """
 import abc
-import uuid
 
 from keystoneauth1 import identity
 from keystoneauth1 import session
 from oslo_config import cfg
 from oslo_context import context
+from oslo_utils import uuidutils
 from oslotest import base
 
 from castellan.common.credentials import keystone_password
@@ -75,7 +75,7 @@ class BarbicanKeyManagerTestCase(test_key_manager.KeyManagerTestCase):
                           self.key_mgr.delete, self.ctxt, None)
 
     def test_delete_unknown_object(self):
-        unknown_uuid = str(uuid.uuid4())
+        unknown_uuid = uuidutils.generate_uuid()
         self.assertRaises(exception.ManagedObjectNotFoundError,
                           self.key_mgr.delete, self.ctxt, unknown_uuid)
 
@@ -91,7 +91,7 @@ class BarbicanKeyManagerTestCase(test_key_manager.KeyManagerTestCase):
                           self.key_mgr.get, self.ctxt, None)
 
     def test_get_unknown_key(self):
-        bad_key_uuid = str(uuid.uuid4())
+        bad_key_uuid = uuidutils.generate_uuid()
         self.assertRaises(exception.ManagedObjectNotFoundError,
                           self.key_mgr.get, self.ctxt, bad_key_uuid)
 
diff --git a/castellan/tests/unit/key_manager/mock_key_manager.py b/castellan/tests/unit/key_manager/mock_key_manager.py
index 0b3123ba..384a4b6f 100644
--- a/castellan/tests/unit/key_manager/mock_key_manager.py
+++ b/castellan/tests/unit/key_manager/mock_key_manager.py
@@ -29,11 +29,11 @@ this class.
 import binascii
 import copy
 import random
-import uuid
 
 from cryptography.hazmat import backends
 from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives import serialization
+from oslo_utils import uuidutils
 
 from castellan.common import exception
 from castellan.common.objects import private_key as pri_key
@@ -151,9 +151,9 @@ class MockKeyManager(key_manager.KeyManager):
         return private_key_uuid, public_key_uuid
 
     def _generate_key_id(self):
-        key_id = str(uuid.uuid4())
+        key_id = uuidutils.generate_uuid()
         while key_id in self.keys:
-            key_id = str(uuid.uuid4())
+            key_id = uuidutils.generate_uuid()
 
         return key_id