Merge "address uuid overwriting"

1 files changed, 5 insertions, 5 deletions

diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index 46cf408f1..a9fbb8fe3 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -19,7 +19,7 @@ import inspect
 import os
 import re
 import urllib
-import uuid
+import uuid as uuid_lib
 
 from lxml import etree
 
@@ -941,7 +941,7 @@ class SchedulerHintsJsonTest(ApiSampleTestBase):
     def test_scheduler_hints_post(self):
         """Get api sample of scheduler hint post request"""
         hints = {'image_id': fake.get_valid_image_id(),
-                 'image_near': str(uuid.uuid4())
+                 'image_near': str(uuid_lib.uuid4())
         }
         response = self._do_post('servers', 'scheduler-hints-post-req',
                                  hints)
@@ -1185,7 +1185,7 @@ class KeyPairsSampleJsonTest(ApiSampleTestBase):
 
     def test_keypairs_post(self, public_key=None):
         """Get api sample of key pairs post request"""
-        key_name = 'keypair-' + str(uuid.uuid4())
+        key_name = 'keypair-' + str(uuid_lib.uuid4())
         response = self._do_post('os-keypairs', 'keypairs-post-req',
                                  {'keypair_name': key_name})
         subs = self._get_regexes()
@@ -1199,7 +1199,7 @@ class KeyPairsSampleJsonTest(ApiSampleTestBase):
 
     def test_keypairs_import_key_post(self):
         """Get api sample of key pairs post to import user's key"""
-        key_name = 'keypair-' + str(uuid.uuid4())
+        key_name = 'keypair-' + str(uuid_lib.uuid4())
         subs = {
             'keypair_name': key_name,
             'public_key': "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDx8nkQv/zgGg"
@@ -1324,7 +1324,7 @@ class CloudPipeSampleJsonTest(ApiSampleTestBase):
     def test_cloud_pipe_create(self):
         """Get api samples of cloud pipe extension creation"""
         self.flags(vpn_image_id=fake.get_valid_image_id())
-        project = {'project_id': 'cloudpipe-' + str(uuid.uuid4())}
+        project = {'project_id': 'cloudpipe-' + str(uuid_lib.uuid4())}
         response = self._do_post('os-cloudpipe', 'cloud-pipe-create-req',
                                  project)
         self.assertEqual(response.status, 200)