commit 8748fdc1b547bfd687c96744736b1e4bc801134a
author Jenkins <jenkins@review.openstack.org> Wed Jan 15 12:43:29 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jan 15 12:43:29 2014 +0000
tree 334674b3ae0438f93c04dc7fdec9f73e5875163f
parent 32f34e339958081f25c3add93be2a5b91df41afa
parent d4bd30b2d407b06b05d3a7618fc115880f0caa21

Merge "fix a minor bug when detecting server image flavor"

tempest/api/compute/servers/test_server_actions.py

diff --git a/tempest/api/compute/servers/test_server_actions.py b/tempest/api/compute/servers/test_server_actions.py
index f195562..e4af2e1 100644
--- a/tempest/api/compute/servers/test_server_actions.py
+++ b/tempest/api/compute/servers/test_server_actions.py
@@ -174,7 +174,7 @@
 
     def _detect_server_image_flavor(self, server_id):
         # Detects the current server image flavor ref.
-        resp, server = self.client.get_server(self.server_id)
+        resp, server = self.client.get_server(server_id)
         current_flavor = server['flavor']['id']
         new_flavor_ref = self.flavor_ref_alt \
             if current_flavor == self.flavor_ref else self.flavor_ref

tempest/api/compute/v3/servers/test_server_actions.py

diff --git a/tempest/api/compute/v3/servers/test_server_actions.py b/tempest/api/compute/v3/servers/test_server_actions.py
index 70359be..f462cc2 100644
--- a/tempest/api/compute/v3/servers/test_server_actions.py
+++ b/tempest/api/compute/v3/servers/test_server_actions.py
@@ -169,7 +169,7 @@
 
     def _detect_server_image_flavor(self, server_id):
         # Detects the current server image flavor ref.
-        resp, server = self.client.get_server(self.server_id)
+        resp, server = self.client.get_server(server_id)
         current_flavor = server['flavor']['id']
         new_flavor_ref = self.flavor_ref_alt \
             if current_flavor == self.flavor_ref else self.flavor_ref