From 0563640214016935097c5cbdcf20d578eb2997bc Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Wed, 29 Sep 2010 11:19:06 +0100
Subject: [PATCH] Move the uuid regexp to utils.py
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/utils.py | 3 +++
test/ganeti.utils_unittest.py | 5 +----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/utils.py b/lib/utils.py
index 13c49766a..8f7c031d1 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -82,6 +82,9 @@ X509_SIGNATURE = re.compile(r"^%s:\s*(?P<salt>%s+)/(?P<sign>%s+)$" %
_VALID_SERVICE_NAME_RE = re.compile("^[-_.a-zA-Z0-9]{1,128}$")
+UUID_RE = re.compile('^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-'
+ '[a-f0-9]{4}-[a-f0-9]{12}$')
+
# Certificate verification results
(CERT_WARNING,
CERT_ERROR) = range(1, 3)
diff --git a/test/ganeti.utils_unittest.py b/test/ganeti.utils_unittest.py
index df5ef2026..1a88db9ea 100755
--- a/test/ganeti.utils_unittest.py
+++ b/test/ganeti.utils_unittest.py
@@ -1244,11 +1244,8 @@ class TestListVisibleFiles(unittest.TestCase):
class TestNewUUID(unittest.TestCase):
"""Test case for NewUUID"""
- _re_uuid = re.compile('^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-'
- '[a-f0-9]{4}-[a-f0-9]{12}$')
-
def runTest(self):
- self.failUnless(self._re_uuid.match(utils.NewUUID()))
+ self.failUnless(utils.UUID_RE.match(utils.NewUUID()))
class TestUniqueSequence(unittest.TestCase):
--
GitLab