tests/openstack/requests/compute/server_tests.rb in fog-maestrodev-1.7.0.20121114190951 vs tests/openstack/requests/compute/server_tests.rb in fog-maestrodev-1.8.0.20130109172219

@@ -1,8 +1,8 @@
 Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
 
-  @server_format = {
+  @detailed_server_format = {
     'id'         => String,
     'addresses'  => Hash,
     'flavor'     => Hash,
     'hostId'     => String,
     'image'      => Hash,
@@ -12,13 +12,21 @@
     'status'     => String,
     'accessIPv4' => Fog::Nullable::String,
     'accessIPv6' => Fog::Nullable::String,
     'links'      => Array,
     'created'    => String,
-    'updated'    => String
+    'updated'    => String,
+    'user_id'    => String,
   }
 
+  @create_format = {
+    'adminPass'       => String,
+    'id'              => String,
+    'links'           => Array,
+    'security_groups' => Fog::Nullable::Array,
+  }
+
   @image_format = {
     'created'   => Fog::Nullable::String,
     'id'        => String,
     'name'      => String,
     'progress'  => Fog::Nullable::Integer,
@@ -31,43 +39,45 @@
     'links'     => Array
   }
 
   tests('success') do
 
-    @image_id = Fog::Compute[:openstack].images[0].id
+    @image_id = get_image_ref
     @snapshot_id = nil
-    @flavor_id = 2
+    @flavor_id = get_flavor_ref
 
-    tests('#create_server("test", #{@image_id} , 19)').formats(@server_format.merge('adminPass' => String), false) do
+    tests('#create_server("test", #{@image_id} , 19)').formats(@create_format, false) do
       data = Fog::Compute[:openstack].create_server("test", @image_id, @flavor_id).body['server']
       @server_id = data['id']
       data
     end
 
     Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? }
 
     #CREATE
-    tests("#get_server_details(#{@server_id})").formats(@server_format, false) do
+    tests("#get_server_details(#{@server_id})").formats(@detailed_server_format, false) do
       Fog::Compute[:openstack].get_server_details(@server_id).body['server']
     end
 
     #LIST
     #NOTE: we can remove strict=false if we remove uuid from GET /servers
     tests('#list_servers').formats({'servers' => [OpenStack::Compute::Formats::SUMMARY]}, false) do
       Fog::Compute[:openstack].list_servers.body
     end
 
     #DETAILS
-    tests('#list_servers_detail').formats({'servers' => [@server_format]}, false) do
+    tests('#list_servers_detail').formats({'servers' => [@detailed_server_format]}, false) do
       Fog::Compute[:openstack].list_servers_detail.body
     end
 
     #CHANGE PASSWORD
-    tests("#change_server_password(#{@server_id}, 'fogupdatedserver')").succeeds do
-      Fog::Compute[:openstack].change_server_password(@server_id, 'foggy')
+    if set_password_enabled 
+      tests("#change_server_password(#{@server_id}, 'fogupdatedserver')").succeeds do
+        Fog::Compute[:openstack].change_server_password(@server_id, 'foggy')
+      end
+      Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? }
     end
-    Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? }
 
     #UPDATE SERVER NAME
     tests("#update_server(#{@server_id}, :name => 'fogupdatedserver')").succeeds do
       Fog::Compute[:openstack].update_server(@server_id, :name => 'fogupdatedserver')
     end
@@ -80,23 +90,23 @@
       data
     end
     Fog::Compute[:openstack].images.get(@snapshot_id).wait_for { ready? }
 
     #REBUILD
-    tests("#rebuild_server(#{@server_id}, #{@snapshot_id}, 'fog')").formats({'server' => @server_format}, false) do
+    tests("#rebuild_server(#{@server_id}, #{@snapshot_id}, 'fog')").formats({'server' => @detailed_server_format}, false) do
       Fog::Compute[:openstack].rebuild_server(@server_id, @snapshot_id, 'fog', 'newpass', {"foo" => "bar"}).body
     end
     Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } if not Fog.mocking?
 
     #RESIZE
-    tests("#resize_server(#{@server_id}, '3')").succeeds do
-      Fog::Compute[:openstack].resize_server(@server_id, 3)
+    tests("#resize_server(#{@server_id}, #{get_flavor_ref_resize})").succeeds do
+      Fog::Compute[:openstack].resize_server(@server_id, get_flavor_ref_resize)
     end
     Fog::Compute[:openstack].servers.get(@server_id).wait_for { self.state == 'VERIFY_RESIZE' } if not Fog.mocking?
 
     #RESIZE CONFIRM
-    tests("#resize_confirm(#{@server_id}, '3')").succeeds do
+    tests("#resize_confirm(#{@server_id}, #{get_flavor_ref_resize})").succeeds do
       Fog::Compute[:openstack].confirm_resize_server(@server_id)
     end
     Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } if not Fog.mocking?
 
     #REBOOT - HARD
@@ -114,9 +124,14 @@
     Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } if not Fog.mocking?
 
     #DELETE
     tests("#delete_server(#{@server_id})").succeeds do
       Fog::Compute[:openstack].delete_server(@server_id)
+    end
+
+    #DELETE IMAGE
+    tests("#delete_image(#{@snapshot_id})").succeeds do
+      Fog::Compute[:openstack].delete_image(@snapshot_id)
     end
 
   end
 
   tests('failure') do