commit d4bd30b2d407b06b05d3a7618fc115880f0caa21
author Jinhe Fang <hzfangjh@corp.netease.com> Tue Jan 07 15:23:41 2014 +0800
committer Jinhe Fang <hzfangjh@corp.netease.com> Tue Jan 07 17:37:37 2014 +0800
tree f1ab455a02d7d5cccabc81d982c704de11886d71
parent 5d1b3dfd758d4ecc3d554b1ef37094b8e8fcd678

fix a minor bug when detecting server image flavor

* The function _detect_server_image_flavor has a parameter 'server_id',
* but does not use it (instead, it uses server_id of the class)

Change-Id: I94d46877a67c79035e4ecf3da9abc0156803f2b3

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 d985d2b..c090308 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 602bd5b..7eeb6ae 100644
--- a/tempest/api/compute/v3/servers/test_server_actions.py
+++ b/tempest/api/compute/v3/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