heat tests : fix CFN_API_Actions test stackid regex

stackid format has changed since move from tenant name to
tenant id

Change-Id: I5e8304f33d49133bc1b7e5530ae1a8323e2986c5
Signed-off-by: Steven Hardy <shardy@redhat.com>

diff --git a/heat/tests/functional/test_CFN_API_Actions.py b/heat/tests/functional/test_CFN_API_Actions.py
index 5c8fa199f00513ba0630b77d2908eeaf8597bc5e..b164c587b85559611f50ecdc0e738b83ca21330e 100644 (file)
--- a/heat/tests/functional/test_CFN_API_Actions.py
+++ b/heat/tests/functional/test_CFN_API_Actions.py
@@ -72,8 +72,9 @@ class CfnApiFunctionalTest(unittest.TestCase):
             cls.logical_resource_status = "CREATE_COMPLETE"
 
             # Save some compiled regexes and strings for response validation
-            cls.stack_id_re = re.compile("^arn:openstack:heat::admin:stacks/"
-                                          + cls.stack.stackname)
+            cls.stack_id_re = re.compile("^arn:openstack:heat::[0-9a-z]{32}:" +
+                                         "stacks/" + cls.stack.stackname)
+
             cls.time_re = re.compile(
                 "[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$")
             cls.description_re = re.compile(

diff --git a/heat/tests/functional/test_CFN_API_Actions_Boto.py b/heat/tests/functional/test_CFN_API_Actions_Boto.py
index d45ee83f5a29b3b553d9629aedd275da7e69fdbf..7fa53de55bbeaa73a9f0625fa165b80a37ae8dd7 100644 (file)
--- a/heat/tests/functional/test_CFN_API_Actions_Boto.py
+++ b/heat/tests/functional/test_CFN_API_Actions_Boto.py
@@ -76,8 +76,8 @@ class CfnApiBotoFunctionalTest(unittest.TestCase):
             cls.logical_resource_status = "CREATE_COMPLETE"
 
             # Save some compiled regexes and strings for response validation
-            cls.stack_id_re = re.compile("^arn:openstack:heat::admin:stacks/"
-                                          + cls.stack.stackname)
+            cls.stack_id_re = re.compile("^arn:openstack:heat::[0-9a-z]{32}:" +
+                                         "stacks/" + cls.stack.stackname)
             cls.time_re = re.compile(
                 "[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$")
             cls.description_re = re.compile(