From: Zane Bitter <zbitter@redhat.com>
Date: Fri, 30 Nov 2012 14:59:23 +0000 (+0100)
Subject: Remove is_uuid() from HeatIdentifier class
X-Git-Tag: 2014.1~1149
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=61303fb7770af94f8d56e2ad527eb0247901dd63;p=openstack-build%2Fheat-build.git

Remove is_uuid() from HeatIdentifier class

We now use the equivalent functionality from openstack-common.

Change-Id: I915cdb92b89d3548fa03e1820d8b90b2aac4e44b
Signed-off-by: Zane Bitter <zbitter@redhat.com>
---

diff --git a/heat/engine/identifier.py b/heat/engine/identifier.py
index 02174101..9b9ae94f 100644
--- a/heat/engine/identifier.py
+++ b/heat/engine/identifier.py
@@ -26,12 +26,6 @@ class HeatIdentifier(collections.Mapping):
     )
     path_re = re.compile(r'stacks/([^/]+)/([^/]+)(.*)')
 
-    HEX_ELEM = '[0-9A-Fa-f]'
-    UUID_PATTERN = '-'.join([HEX_ELEM + '{8}', HEX_ELEM + '{4}',
-                         HEX_ELEM + '{4}', HEX_ELEM + '{4}',
-                         HEX_ELEM + '{12}'])
-    uuid_re = re.compile(r'^' + UUID_PATTERN + '$')
-
     def __init__(self, tenant, stack_name, stack_id, path=''):
         '''
         Initialise a HeatIdentifier from a Tenant ID, Stack name, Stack ID
@@ -48,10 +42,6 @@ class HeatIdentifier(collections.Mapping):
             self.PATH: path,
         }
 
-    @classmethod
-    def is_uuid(cls, uuid):
-        return HeatIdentifier.uuid_re.match(uuid)
-
     @classmethod
     def from_arn(cls, arn):
         '''
diff --git a/heat/tests/test_identifier.py b/heat/tests/test_identifier.py
index cf78a0ea..1327ae97 100644
--- a/heat/tests/test_identifier.py
+++ b/heat/tests/test_identifier.py
@@ -20,7 +20,6 @@ import mox
 import json
 
 from heat.engine import identifier
-from heat.common import utils
 
 
 @attr(tag=['unit', 'identifier'])
@@ -226,17 +225,6 @@ class IdentifierTest(unittest.TestCase):
         hi = identifier.HeatIdentifier('t', 's', 'i', 'p1/p2/p3')
         self.assertEqual(hi._path_components(), ['p1', 'p2', 'p3'])
 
-    def test_uuid_match(self):
-        uuid = utils.generate_uuid()
-        self.assertTrue(identifier.HeatIdentifier.is_uuid(uuid))
-        self.assertFalse(identifier.HeatIdentifier.is_uuid('a' + uuid))
-        self.assertFalse(identifier.HeatIdentifier.is_uuid(
-            'zzzzzzzz-zzzz-zzzz-zzzzzzzzzzzz'))
-        self.assertFalse(identifier.HeatIdentifier.is_uuid(uuid + 'a'))
-        for i in xrange(100):
-            self.assertTrue(identifier.HeatIdentifier.is_uuid(
-                utils.generate_uuid()))
-
 
 @attr(tag=['unit', 'identifier'])
 @attr(speed='fast')