servers.rb in torpedo-1.0.18

- old
+ new

@@ -11,20 +11,20 @@
   @@image_ref = nil
   @@flavor_ref = nil
   @@flavor_ref_resize = nil
   @@server = nil #ref to last created server
   @@hostname = "torpedo"
+  @@host_id = nil
 
   def setup
     @conn=Helper::get_connection
   end
 
   def create_server(server_opts)
     @@server = @conn.create_server(server_opts)
     @@servers << @@server
     @@admin_pass = @@server.adminPass #original admin_pass
-    @@host_id = @@server.hostId #original host ID
     @@server
   end
 
   def create_image(server, image_opts)
     image = server.create_image(image_opts)
@@ -319,10 +319,14 @@
     check_server(server, @@image_ref, @@flavor_ref)
   end if TEST_ADMIN_PASSWORD
 
   def test_040_resize_revert
 
+    # before resizing obtain host_id
+    server = @conn.server(@@server.id)
+    @@host_id = server.hostId #original host ID
+
     @@server.resize!(@@flavor_ref_resize)
     server = @conn.server(@@server.id)
     assert_equal('RESIZE', server.status)
 
     begin
@@ -353,16 +357,20 @@
     rescue Timeout::Error => te
       fail('Timeout waiting for revert resize.')
     end
 
     check_server(server, @@image_ref, @@flavor_ref)
-    assert_equal(server.hostId, @@host_id)
+    assert_equal(@@host_id, server.hostId)
 
   end if TEST_REVERT_RESIZE_SERVER
 
   def test_041_resize
 
+    # before resizing obtain host_id
+    server = @conn.server(@@server.id)
+    @@host_id = server.hostId #original host ID
+
     @@server.resize!(@@flavor_ref_resize)
     server = @conn.server(@@server.id)
     assert_equal('RESIZE', server.status)
 
     begin
@@ -378,10 +386,10 @@
     rescue Timeout::Error => te
       fail('Timeout resizing server.')
     end
  
     check_server(server, @@image_ref, @@flavor_ref_resize, 'VERIFY_RESIZE')
-    assert_not_equal(server.hostId, @@host_id) if TEST_HOSTID_ON_RESIZE
+    assert_not_equal(@@host_id, server.hostId) if TEST_HOSTID_ON_RESIZE
 
   end if TEST_RESIZE_SERVER
 
   def test_042_resize_confirm
 