From 24818e8f214f44bd88715ccd2a787a968461a325 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 5 Nov 2007 12:14:00 +0000
Subject: [PATCH] Rename utils.GetUUID to utils.NewUUID.
Reviewed-by: schreiberal
---
lib/config.py | 2 +-
lib/utils.py | 2 +-
qa/qa_cluster.py | 6 +++---
test/ganeti.utils_unittest.py | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/config.py b/lib/config.py
index 0c769d2bc..50fc784dc 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -133,7 +133,7 @@ class ConfigWriter:
existing.update(exceptions)
retries = 64
while retries > 0:
- unique_id = utils.GetUUID()
+ unique_id = utils.NewUUID()
if unique_id not in existing and unique_id is not None:
break
else:
diff --git a/lib/utils.py b/lib/utils.py
index d5d604b2f..f22537917 100644
--- a/lib/utils.py
+++ b/lib/utils.py
@@ -847,7 +847,7 @@ def GetHomeDir(user, default=None):
return result.pw_dir
-def GetUUID():
+def NewUUID():
"""Returns a random UUID.
"""
diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 2995885dc..8b3d3eb29 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -164,7 +164,7 @@ def TestClusterCopyfile():
"""gnt-cluster copyfile"""
master = qa_config.GetMasterNode()
- uniqueid = utils.GetUUID()
+ uniqueid = utils.NewUUID()
# Create temporary file
f = tempfile.NamedTemporaryFile()
@@ -188,8 +188,8 @@ def TestClusterCommand():
"""gnt-cluster command"""
master = qa_config.GetMasterNode()
- uniqueid = utils.GetUUID()
- rfile = "/tmp/gnt%s" % utils.GetUUID()
+ uniqueid = utils.NewUUID()
+ rfile = "/tmp/gnt%s" % utils.NewUUID()
rcmd = utils.ShellQuoteArgs(['echo', '-n', uniqueid])
cmd = utils.ShellQuoteArgs(['gnt-cluster', 'command',
"%s >%s" % (rcmd, rfile)])
diff --git a/test/ganeti.utils_unittest.py b/test/ganeti.utils_unittest.py
index 4de493a32..22c0cc40b 100755
--- a/test/ganeti.utils_unittest.py
+++ b/test/ganeti.utils_unittest.py
@@ -541,14 +541,14 @@ class TestListVisibleFiles(unittest.TestCase):
self._test(files, expected)
-class TestGetUUID(unittest.TestCase):
- """Test case for GetUUID"""
+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.GetUUID()))
+ self.failUnless(self._re_uuid.match(utils.NewUUID()))
if __name__ == '__main__':
--
GitLab