From 69413b91ea0f542f6be1197f0b983a28a411eb57 Mon Sep 17 00:00:00 2001 From: janonymous Date: Tue, 6 Dec 2016 13:34:19 +0530 Subject: [PATCH] Replace str(uuid.uuid4) with uuidutils.generate_uuid() Change-Id: I94c8a2b54ce00ce041038c3867e0d17123979089 --- tempest/lib/cmd/check_uuid.py | 3 ++- tempest/lib/common/utils/data_utils.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tempest/lib/cmd/check_uuid.py b/tempest/lib/cmd/check_uuid.py index 1239ac533f..88ce775d33 100755 --- a/tempest/lib/cmd/check_uuid.py +++ b/tempest/lib/cmd/check_uuid.py @@ -23,6 +23,7 @@ import sys import unittest import uuid +from oslo_utils import uuidutils import six.moves.urllib.parse as urlparse DECORATOR_MODULE = 'test' @@ -61,7 +62,7 @@ class SourcePatcher(object): if filename not in self.source_files: with open(filename) as f: self.source_files[filename] = self._quote(f.read()) - patch_id = str(uuid.uuid4()) + patch_id = uuidutils.generate_uuid() if not patch.endswith('\n'): patch += '\n' self.patches[patch_id] = self._quote(patch) diff --git a/tempest/lib/common/utils/data_utils.py b/tempest/lib/common/utils/data_utils.py index 4095c77f08..75c2e51742 100644 --- a/tempest/lib/common/utils/data_utils.py +++ b/tempest/lib/common/utils/data_utils.py @@ -21,6 +21,7 @@ import uuid from debtcollector import removals from oslo_utils import netutils +from oslo_utils import uuidutils import six.moves @@ -30,7 +31,7 @@ def rand_uuid(): :return: a random UUID (e.g. '1dc12c7d-60eb-4b61-a7a2-17cf210155b6') :rtype: string """ - return str(uuid.uuid4()) + return uuidutils.generate_uuid() def rand_uuid_hex():