From: Zane Bitter <zbitter@redhat.com>
Date: Wed, 31 Oct 2012 19:18:42 +0000 (+0100)
Subject: Clean up hacks for parameter passing in unit tests
X-Git-Tag: 2014.1~1259
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a5485ad10d3a0336b1f92c1938d3b87ce15bdf82;p=openstack-build%2Fheat-build.git

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 76f71aa4..d8410660 100644
--- 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 95057ecb..ba419a42 100644
--- 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 4a417e9e..14c7378e 100644
--- 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 3b730c7c..1b887383 100644
--- 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 0ad4f25f..78b8f86f 100644
--- 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 35dd9d2b..2047f562 100644
--- 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 1ef43cb8..9f504869 100644
--- 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 c127d2c1..ae9eb167 100644
--- 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