diff options
| author | Anusree <anusree.a04@gmail.com> | 2017-07-27 18:21:12 +0530 |
|---|---|---|
| committer | Anusree <anusree.a04@gmail.com> | 2017-07-27 18:44:49 +0530 |
| commit | 0273a35a041e2e7b16a9918ec8f2c24624fa7be2 (patch) | |
| tree | af3d095e73b71141d4b8115aacadda0728a24357 | |
| parent | accd70a656ef229a085850d358d8a4025cc3ccd2 (diff) | |
| download | designate-0273a35a041e2e7b16a9918ec8f2c24624fa7be2.tar.gz | |
use oslo_utils.uuidutils module
oslo_utils.uuidutils has a wrapper for generating uuids and check uuid.
We should only use that function when generating uuids for consistency.
Change-Id: Ia219e99df1e3ec97db36efb56114a0a1f1b46930
Closes-Bug: #1082248
| -rw-r--r-- | designate/utils.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/designate/utils.py b/designate/utils.py index a61f600a..1a0dbe59 100644 --- a/designate/utils.py +++ b/designate/utils.py @@ -18,7 +18,6 @@ import json import functools import inspect import os -import uuid import socket import six @@ -28,6 +27,7 @@ from oslo_config import cfg from oslo_concurrency import processutils from oslo_log import log as logging from oslo_utils import timeutils +from oslo_utils import uuidutils from oslo_utils.netutils import is_valid_ipv6 from designate.common import config @@ -306,7 +306,7 @@ def deep_dict_merge(a, b): def generate_uuid(): - return str(uuid.uuid4()) + return uuidutils.generate_uuid(dashed=True) def is_uuid_like(val): @@ -316,10 +316,7 @@ def is_uuid_like(val): aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa """ - try: - return str(uuid.UUID(val)) == val - except (TypeError, ValueError, AttributeError): - return False + return uuidutils.is_uuid_like(val) def validate_uuid(*check): |