commit ef9d842e95d52740b4fdfb08c7d162d1e7f7bb49
author Sergey Kraynev <skraynev@mirantis.com> Fri Feb 13 03:41:46 2015 -0500
committer Sergey Kraynev <skraynev@mirantis.com> Fri Feb 13 04:59:57 2015 -0500
tree ce019d344c51d80cfc38c428fd01d472381a0f24
parent d6fa5c0f9fb4ec30ed7da9adf5038059aef47727

Re-use stack_create method from base class

Change-Id: Icc46f6c61b2fa7974b39b76f2142f33bc50ae06b

scenario/test_server_cfn_init.py

diff --git a/scenario/test_server_cfn_init.py b/scenario/test_server_cfn_init.py
index 630e2e9..9d85120 100644
--- a/scenario/test_server_cfn_init.py
+++ b/scenario/test_server_cfn_init.py
@@ -30,7 +30,6 @@
         self.sub_dir = 'templates'
 
     def assign_keypair(self):
-        self.stack_name = self._stack_rand_name()
         if self.conf.keypair_name:
             self.keypair = None
             self.keypair_name = self.conf.keypair_name
@@ -40,7 +39,7 @@
 
     def launch_stack(self):
         net = self._get_default_network()
-        self.parameters = {
+        parameters = {
             'key_name': self.keypair_name,
             'flavor': self.conf.instance_type,
             'image': self.conf.image_ref,
@@ -49,19 +48,12 @@
         }
 
         # create the stack
-        self.template = self._load_template(__file__, self.template_name,
-                                            self.sub_dir)
-        self.client.stacks.create(
-            stack_name=self.stack_name,
-            template=self.template,
-            parameters=self.parameters)
+        template = self._load_template(__file__, self.template_name,
+                                       self.sub_dir)
+        return self.stack_create(template=template,
+                                 parameters=parameters)
 
-        self.stack = self.client.stacks.get(self.stack_name)
-        self.stack_identifier = '%s/%s' % (self.stack_name, self.stack.id)
-        self.addCleanup(self._stack_delete, self.stack_identifier)
-
-    def check_stack(self):
-        sid = self.stack_identifier
+    def check_stack(self, sid):
         self._wait_for_resource_status(
             sid, 'WaitHandle', 'CREATE_COMPLETE')
         self._wait_for_resource_status(
@@ -123,5 +115,5 @@
 
     def test_server_cfn_init(self):
         self.assign_keypair()
-        self.launch_stack()
-        self.check_stack()
+        sid = self.launch_stack()
+        self.check_stack(sid)