commit a265c135679c787d47410b9803d60de92b691856
author Sergey Kraynev <skraynev@mirantis.com> Fri Feb 13 03:51:03 2015 -0500
committer Sergey Kraynev <skraynev@mirantis.com> Fri Feb 13 06:27:14 2015 -0500
tree 84d24124c0e864e5a5b9d8a144e02e4da2ea8639
parent ef9d842e95d52740b4fdfb08c7d162d1e7f7bb49

Move assign_keypair method in base class

Change-Id: I69b8db037991f88b38b293560532bf51c0a04378

functional/test_template_resource.py

diff --git a/functional/test_template_resource.py b/functional/test_template_resource.py
index 80dcdce..2e929b4 100644
--- a/functional/test_template_resource.py
+++ b/functional/test_template_resource.py
@@ -361,11 +361,7 @@
     def setUp(self):
         super(TemplateResourceUpdateFailedTest, self).setUp()
         self.client = self.orchestration_client
-        if self.conf.keypair_name:
-            self.keypair_name = self.conf.keypair_name
-        else:
-            self.keypair = self.create_keypair()
-            self.keypair_name = self.keypair.id
+        self.assign_keypair()
 
     def test_update_on_failed_create(self):
         # create a stack with "server" dependent on "keypair", but

functional/test_validation.py

diff --git a/functional/test_validation.py b/functional/test_validation.py
index 52309cd..2d9669d 100644
--- a/functional/test_validation.py
+++ b/functional/test_validation.py
@@ -29,11 +29,7 @@
         if not self.conf.instance_type:
             raise self.skipException("No instance_type configured to test")
 
-        if self.conf.keypair_name:
-            self.keypair_name = self.conf.keypair_name
-        else:
-            self.keypair = self.create_keypair()
-            self.keypair_name = self.keypair.id
+        self.assign_keypair()
 
     def test_stack_validate_provider_references_parent_resource(self):
         template = '''