commit 1f469a566aef0e09d32a35a6b9996a8180721916
author Jenkins <jenkins@review.openstack.org> Thu Aug 29 09:21:08 2013 +0000
committer Gerrit Code Review <review@openstack.org> Thu Aug 29 09:21:08 2013 +0000
tree 86375f05b72063c11c544e7aab2f1d6b0c7c427e
parent 1988bba89db80c214ce5c43bd39c1619c3d64f37
parent 8ca06257cfba403a5d375104fe553e51233a879f

Merge "Use common create_keypair method for autoscaling"

tempest/scenario/manager.py

diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 886bf3a..1703248 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -590,7 +590,3 @@
     @classmethod
     def _stack_rand_name(cls):
         return rand_name(cls.__name__ + '-')
-
-    def _create_keypair(self):
-        kp_name = rand_name('keypair-smoke')
-        return self.compute_client.keypairs.create(kp_name)

tempest/scenario/orchestration/test_autoscaling.py

diff --git a/tempest/scenario/orchestration/test_autoscaling.py b/tempest/scenario/orchestration/test_autoscaling.py
index cd959a8..17870a1 100644
--- a/tempest/scenario/orchestration/test_autoscaling.py
+++ b/tempest/scenario/orchestration/test_autoscaling.py
@@ -35,9 +35,8 @@
         if self.config.orchestration.keypair_name:
             self.keypair_name = self.config.orchestration.keypair_name
         else:
-            self.keypair = self._create_keypair()
+            self.keypair = self.create_keypair()
             self.keypair_name = self.keypair.id
-            self.set_resource('keypair', self.keypair)
 
     def launch_stack(self):
         self.parameters = {