Clean up hacks for parameter passing in unit tests

Don't rely on the internal behaviour of the Parameters class.

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

diff --git a/heat/tests/test_autoscaling.py b/heat/tests/test_autoscaling.py
index 76f71aa4b0771e2fad049d101b399e5bcb7b6d11..d8410660e5700bd5c50e5d361f29b5720b52c3bc 100644 (file)
--- a/heat/tests/test_autoscaling.py
+++ b/heat/tests/test_autoscaling.py
@@ -53,9 +53,10 @@ class AutoScalingTest(unittest.TestCase):
             username = 'test_username'
             password = 'password'
             auth_url = 'http://localhost:5000/v2.0'
-        t['Parameters']['KeyName']['Value'] = 'test'
-        stack = parser.Stack(DummyContext(), 'test_stack', parser.Template(t),
-                             stack_id=-1)
+        template = parser.Template(t)
+        params = parser.Parameters('test_stack', template, {'KeyName': 'test'})
+        stack = parser.Stack(DummyContext(), 'test_stack', template,
+                             params, stack_id=-1)
 
         return stack
 

diff --git a/heat/tests/test_dbinstance.py b/heat/tests/test_dbinstance.py
index 95057ecb08fd197a685bb07fbe1a9e29be8aa8b4..ba419a422dbe905895adcb2d17dc0551617a5252 100644 (file)
--- a/heat/tests/test_dbinstance.py
+++ b/heat/tests/test_dbinstance.py
@@ -56,9 +56,10 @@ class DBInstanceTest(unittest.TestCase):
             username = 'test_username'
             password = 'password'
             auth_url = 'http://localhost:5000/v2.0'
-        t['Parameters']['KeyName']['Value'] = 'test'
-        stack = parser.Stack(DummyContext(), 'test_stack', parser.Template(t),
-                             stack_id=-1)
+        template = parser.Template(t)
+        params = parser.Parameters('test_stack', template, {'KeyName': 'test'})
+        stack = parser.Stack(DummyContext(), 'test_stack', template,
+                             params, stack_id=-1)
 
         return stack
 

diff --git a/heat/tests/test_eip.py b/heat/tests/test_eip.py
index 4a417e9e2325d741e85890a8be35a282c1d402c9..14c7378ea3f8b856b6b322371db5b5ec2020c277 100644 (file)
--- a/heat/tests/test_eip.py
+++ b/heat/tests/test_eip.py
@@ -56,9 +56,10 @@ class EIPTest(unittest.TestCase):
             username = 'test_username'
             password = 'password'
             auth_url = 'http://localhost:5000/v2.0'
-        t['Parameters']['KeyName']['Value'] = 'test'
-        stack = parser.Stack(DummyContext(), 'test_stack', parser.Template(t),
-                             stack_id=-1)
+        template = parser.Template(t)
+        params = parser.Parameters('test_stack', template, {'KeyName': 'test'})
+        stack = parser.Stack(DummyContext(), 'test_stack', template,
+                             params, stack_id=-1)
 
         return stack
 

diff --git a/heat/tests/test_instance.py b/heat/tests/test_instance.py
index 3b730c7c7072559e1822286926df1dd805c454d5..1b8873837c5a388e814e9a01be460df66a18f69d 100644 (file)
--- a/heat/tests/test_instance.py
+++ b/heat/tests/test_instance.py
@@ -49,9 +49,10 @@ class instancesTest(unittest.TestCase):
         t = json.loads(f.read())
         f.close()
 
-        t['Parameters']['KeyName']['Value'] = 'test'
-        stack = parser.Stack(None, 'test_stack', parser.Template(t),
-                             stack_id=-1)
+        template = parser.Template(t)
+        params = parser.Parameters('test_stack', template, {'KeyName': 'test'})
+        stack = parser.Stack(None, 'test_stack', template,
+                             params, stack_id=-1)
 
         self.m.StubOutWithMock(db_api, 'resource_get_by_name_and_stack')
         db_api.resource_get_by_name_and_stack(None, 'test_resource_name',
@@ -90,9 +91,10 @@ class instancesTest(unittest.TestCase):
         t = json.loads(f.read())
         f.close()
 
-        t['Parameters']['KeyName']['Value'] = 'test'
-        stack = parser.Stack(None, 'test_stack', parser.Template(t),
-                             stack_id=-1)
+        template = parser.Template(t)
+        params = parser.Parameters('test_stack', template, {'KeyName': 'test'})
+        stack = parser.Stack(None, 'test_stack', template,
+                             params, stack_id=-1)
 
         self.m.StubOutWithMock(db_api, 'resource_get_by_name_and_stack')
         db_api.resource_get_by_name_and_stack(None, 'test_resource_name',

diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py
index 0ad4f25f2bff87a62b2c9011aa4a588dd92e8557..78b8f86f80ce1957eee4ae4feebbe4e708cb263c 100644 (file)
--- a/heat/tests/test_loadbalancer.py
+++ b/heat/tests/test_loadbalancer.py
@@ -64,11 +64,10 @@ class LoadBalancerTest(unittest.TestCase):
             username = 'test_username'
             password = 'password'
             auth_url = 'http://localhost:5000/v2.0'
-        t['Parameters']['KeyName']['Value'] = 'test'
-        t['Parameters']['KeyName']['Value'] = 'test'
-
-        stack = parser.Stack(DummyContext(), 'test_stack', parser.Template(t),
-                             stack_id=-1)
+        template = parser.Template(t)
+        params = parser.Parameters('test_stack', template, {'KeyName': 'test'})
+        stack = parser.Stack(DummyContext(), 'test_stack', template,
+                             params, stack_id=-1)
 
         return stack
 

diff --git a/heat/tests/test_user.py b/heat/tests/test_user.py
index 35dd9d2bd2cafb6b03ddcc245a6a9d7d155ef5d9..2047f56245f5914fe7ee5de946d719560b6f21b6 100644 (file)
--- a/heat/tests/test_user.py
+++ b/heat/tests/test_user.py
@@ -77,12 +77,15 @@ class UserTest(unittest.TestCase):
             username = 'test_username'
             password = 'password'
             auth_url = 'http://localhost:5000/v2.0'
-        t['Parameters']['KeyName']['Value'] = 'test'
-        t['Parameters']['DBRootPassword']['Value'] = 'test'
-        t['Parameters']['DBUsername']['Value'] = 'test'
-        t['Parameters']['DBPassword']['Value'] = 'test'
-        stack = parser.Stack(DummyContext(), 'test_stack', parser.Template(t),
-                             stack_id=-1)
+        template = parser.Template(t)
+        params = parser.Parameters('test_stack',
+                                   template,
+                                   {'KeyName': 'test',
+                                    'DBRootPassword': 'test',
+                                    'DBUsername': 'test',
+                                    'DBPassword': 'test'})
+        stack = parser.Stack(DummyContext(), 'test_stack', template,
+                             params, stack_id=-1)
 
         return stack
 

diff --git a/heat/tests/test_validate.py b/heat/tests/test_validate.py
index 1ef43cb88858ae4d90e628741a193fad1a23a575..9f504869817ea2e989cb402402cc5690144f9d98 100644 (file)
--- a/heat/tests/test_validate.py
+++ b/heat/tests/test_validate.py
@@ -252,8 +252,6 @@ class validateTest(unittest.TestCase):
 
     def test_validate_ref_valid(self):
         t = json.loads(test_template_ref % 'WikiDatabase')
-        t['Parameters']['KeyName']['Value'] = 'test'
-        params = {}
 
         self.m.StubOutWithMock(instances.Instance, 'nova')
         instances.Instance.nova().AndReturn(self.fc)
@@ -267,8 +265,6 @@ class validateTest(unittest.TestCase):
 
     def test_validate_ref_invalid(self):
         t = json.loads(test_template_ref % 'WikiDatabasez')
-        t['Parameters']['KeyName']['Value'] = 'test'
-        params = {}
 
         self.m.StubOutWithMock(instances.Instance, 'nova')
         instances.Instance.nova().AndReturn(self.fc)
@@ -281,8 +277,6 @@ class validateTest(unittest.TestCase):
 
     def test_validate_findinmap_valid(self):
         t = json.loads(test_template_findinmap_valid)
-        t['Parameters']['KeyName']['Value'] = 'test'
-        params = {}
 
         self.m.StubOutWithMock(instances.Instance, 'nova')
         instances.Instance.nova().AndReturn(self.fc)
@@ -295,8 +289,6 @@ class validateTest(unittest.TestCase):
 
     def test_validate_findinmap_invalid(self):
         t = json.loads(test_template_findinmap_invalid)
-        t['Parameters']['KeyName']['Value'] = 'test'
-        params = {}
 
         self.m.StubOutWithMock(instances.Instance, 'nova')
         instances.Instance.nova().AndReturn(self.fc)

diff --git a/heat/tests/test_volume.py b/heat/tests/test_volume.py
index c127d2c106a1ebf74c09f89f0ef9973a6c25f6ad..ae9eb1676954afe4a2f6ccf58b63e8ad6f719126 100644 (file)
--- a/heat/tests/test_volume.py
+++ b/heat/tests/test_volume.py
@@ -62,9 +62,10 @@ class VolumeTest(unittest.TestCase):
             username = 'test_username'
             password = 'password'
             auth_url = 'http://localhost:5000/v2.0'
-        t['Parameters']['KeyName']['Value'] = 'test'
-        stack = parser.Stack(DummyContext(), 'test_stack', parser.Template(t),
-                             stack_id=-1)
+        template = parser.Template(t)
+        params = parser.Parameters('test_stack', template, {'KeyName': 'test'})
+        stack = parser.Stack(DummyContext(), 'test_stack', template,
+                             params, stack_id=-1)
 
         return stack