fog 1.8.0 → 1.9.0

data/tests/rackspace/models/storage/file_tests.rb

@@ -26,6 +26,12 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do
     directories.
     create(directory_attributes)
 
+  model_tests(@directory.files, file_attributes.merge(:etag => 'foo'), Fog.mocking?) do
+    tests('#save should not blow up with etag') do
+      @instance.save
+    end
+  end
+
   model_tests(@directory.files, file_attributes, Fog.mocking?) do
 
     tests("#metadata should load empty metadata").returns({}) do

data/tests/rackspace/requests/block_storage/snapshot_tests.rb

@@ -1,23 +1,23 @@
 Shindo.tests('Fog::Rackspace::BlockStorage | snapshot_tests', ['rackspace']) do
+  timeout = Fog.mocking? ? 1 : 10
 
-  pending if Fog.mocking?
-
-  SNAPSHOT_FORMAT = {
+  snapshot_format = {
     'id' => String,
     'status' => String,
     'display_name' => Fog::Nullable::String,
     'display_description' => Fog::Nullable::String,
     'volume_id' => String,
     'size' => Integer,
-    'created_at' => String
+    'created_at' => String,
+    'availability_zone' => String
   }
 
-  GET_SNAPSHOT_FORMAT = {
-    'snapshot' => SNAPSHOT_FORMAT
+  get_snapshot_format = {
+    'snapshot' => snapshot_format
   }
 
-  LIST_SNAPSHOT_FORMAT = {
-    'snapshots' => [SNAPSHOT_FORMAT]
+  list_snapshot_format = {
+    'snapshots' => [snapshot_format]
   }
 
   def snapshot_deleted?(service, snapshot_id)
@@ -32,30 +32,30 @@ Shindo.tests('Fog::Rackspace::BlockStorage | snapshot_tests', ['rackspace']) do
   service = Fog::Rackspace::BlockStorage.new
 
   tests('success') do
-    volume = service.create_volume(10).body['volume']
+    volume = service.create_volume(100).body['volume']
     volume_id = volume['id']
     snapshot_id = nil
 
     until service.get_volume(volume_id).body['volume']['status'] == 'available'
-      sleep 10
+      sleep timeout
     end
 
-    tests("#create_snapshot(#{volume_id})").formats(GET_SNAPSHOT_FORMAT) do
+    tests("#create_snapshot(#{volume_id})").formats(get_snapshot_format) do
       service.create_snapshot(volume_id).body.tap do |b|
         snapshot_id = b['snapshot']['id']
       end
     end
 
-    tests("#list_snapshots").formats(LIST_SNAPSHOT_FORMAT) do
+    tests("#list_snapshots").formats(list_snapshot_format) do
       service.list_snapshots.body
     end
 
-    tests("#get_snapshot(#{snapshot_id})").formats(GET_SNAPSHOT_FORMAT) do
+    tests("#get_snapshot(#{snapshot_id})").formats(get_snapshot_format) do
       service.get_snapshot(snapshot_id).body
     end
 
     until service.get_snapshot(snapshot_id).body['snapshot']['status'] == 'available' do
-      sleep 10
+      sleep timeout
     end
 
     tests("#delete_snapshot(#{snapshot_id})").succeeds do
@@ -63,7 +63,7 @@ Shindo.tests('Fog::Rackspace::BlockStorage | snapshot_tests', ['rackspace']) do
     end
 
     until snapshot_deleted?(service, snapshot_id)
-      sleep 10
+      sleep timeout
     end
 
     service.delete_volume(volume_id)

data/tests/rackspace/requests/block_storage/volume_tests.rb

@@ -1,8 +1,6 @@
 Shindo.tests('Fog::Rackspace::BlockStorage | volume_tests', ['rackspace']) do
 
-  pending if Fog.mocking?
-
-  VOLUME_FORMAT = {
+  volume_format = {
     'id' => String,
     'status' => String,
     'display_name' => Fog::Nullable::String,
@@ -16,31 +14,31 @@ Shindo.tests('Fog::Rackspace::BlockStorage | volume_tests', ['rackspace']) do
     'metadata' => Hash
   }
 
-  GET_VOLUME_FORMAT = {
-    'volume' => VOLUME_FORMAT
+  get_volume_format = {
+    'volume' => volume_format
   }
 
-  LIST_VOLUME_FORMAT = {
-    'volumes' => [VOLUME_FORMAT]
+  list_volume_format = {
+    'volumes' => [volume_format]
   }
 
   service = Fog::Rackspace::BlockStorage.new
 
   tests('success') do
     id = nil
-    size = 10
+    size = 100
 
-    tests("#create_volume(#{size})").formats(GET_VOLUME_FORMAT) do
+    tests("#create_volume(#{size})").formats(get_volume_format) do
       data = service.create_volume(size).body
       id = data['volume']['id']
       data
     end
 
-    tests("#list_volumes").formats(LIST_VOLUME_FORMAT) do
+    tests("#list_volumes").formats(list_volume_format) do
       service.list_volumes.body
     end
 
-    tests("#get_volume(#{id})").formats(GET_VOLUME_FORMAT) do
+    tests("#get_volume(#{id})").formats(get_volume_format) do
       service.get_volume(id).body
     end
 

data/tests/rackspace/requests/block_storage/volume_type_tests.rb

@@ -1,30 +1,27 @@
 Shindo.tests('Fog::Rackspace::BlockStorage | volume_type_tests', ['rackspace']) do
-
-  pending if Fog.mocking?
-
-  VOLUME_TYPE_FORMAT = {
+  volume_type_format = {
     'name' => String,
     'extra_specs' => Hash
   }
 
-  LIST_VOLUME_TYPE_FORMAT = {
-    'volume_types' => [VOLUME_TYPE_FORMAT.merge({ 'id' => Integer })]
+  list_volume_type_format = {
+    'volume_types' => [volume_type_format.merge({ 'id' => Integer })]
   }
 
-  GET_VOLUME_TYPE_FORMAT = {
-    'volume_type' => VOLUME_TYPE_FORMAT.merge({ 'id' => String })
+  get_volume_type_format = {
+    'volume_type' => volume_type_format.merge({ 'id' => String })
   }
 
   service = Fog::Rackspace::BlockStorage.new
 
   tests('success') do
-    volume_type_id = 1
+    volume_type_id = service.volume_types.first.id
 
-    tests("#list_volume_types").formats(LIST_VOLUME_TYPE_FORMAT) do
+    tests("#list_volume_types").formats(list_volume_type_format) do
       service.list_volume_types.body
     end
 
-    tests("#get_volume_type(#{volume_type_id})").formats(GET_VOLUME_TYPE_FORMAT) do
+    tests("#get_volume_type(#{volume_type_id})").formats(get_volume_type_format) do
       service.get_volume_type(volume_type_id).body
     end
   end

data/tests/rackspace/requests/compute/address_tests.rb

@@ -1,19 +1,21 @@
 Shindo.tests('Fog::Compute[:rackspace] | address requests', ['rackspace']) do
 
+  @service = Fog::Compute.new(:provider => :rackspace, :version => :v1)
+  
   tests('success') do
-
-    @server = Fog::Compute[:rackspace].servers.create(:flavor_id => 1, :image_id => 19)
+ 
+    @server = @service.servers.create(:flavor_id => 1, :image_id => 19)
 
     tests("#list_addresses(#{@server.id})").formats({'addresses' => {'private' => [String], 'public' => [String]}}) do
-      Fog::Compute[:rackspace].list_addresses(@server.id).body
+      @service.list_addresses(@server.id).body
     end
 
     tests("#list_private_addresses(#{@server.id})").formats({'private' => [String]}) do
-      Fog::Compute[:rackspace].list_private_addresses(@server.id).body
+      @service.list_private_addresses(@server.id).body
     end
 
     tests("#list_public_addresses(#{@server.id})").formats({'public' => [String]}) do
-      Fog::Compute[:rackspace].list_public_addresses(@server.id).body
+      @service.list_public_addresses(@server.id).body
     end
 
     @server.wait_for { ready? }
@@ -22,17 +24,17 @@ Shindo.tests('Fog::Compute[:rackspace] | address requests', ['rackspace']) do
   end
 
   tests('failure') do
-
+  
     tests('#list_addresses(0)').raises(Fog::Compute::Rackspace::NotFound) do
-      Fog::Compute[:rackspace].list_addresses(0)
+      @service.list_addresses(0)
     end
 
     tests('#list_private_addresses(0)').raises(Fog::Compute::Rackspace::NotFound) do
-      Fog::Compute[:rackspace].list_private_addresses(0)
+      @service.list_private_addresses(0)
     end
 
     tests('#list_public_addresses(0)').raises(Fog::Compute::Rackspace::NotFound) do
-      Fog::Compute[:rackspace].list_public_addresses(0)
+      @service.list_public_addresses(0)
     end
 
   end

data/tests/rackspace/requests/compute/flavor_tests.rb

@@ -7,21 +7,22 @@ Shindo.tests('Fog::Compute[:rackspace] | flavor requests', ['rackspace']) do
     'ram'   => Integer
   }
 
-  tests('success') do
+  @service = Fog::Compute.new(:provider => :rackspace, :version => :v1)  
 
+  tests('success') do
     tests('#get_flavor_details(1)').formats(@flavor_format) do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].get_flavor_details(1).body['flavor']
+       @service.get_flavor_details(1).body['flavor']
     end
 
     tests('#list_flavors').formats({'flavors' => [Rackspace::Compute::Formats::SUMMARY]}) do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].list_flavors.body
+       @service.list_flavors.body
     end
 
     tests('#list_flavors_detail').formats({'flavors' => [@flavor_format]}) do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].list_flavors_detail.body
+       @service.list_flavors_detail.body
     end
 
   end
@@ -30,7 +31,7 @@ Shindo.tests('Fog::Compute[:rackspace] | flavor requests', ['rackspace']) do
 
     tests('#get_flavor_details(0)').raises(Fog::Compute::Rackspace::NotFound) do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].get_flavor_details(0)
+       @service.get_flavor_details(0)
     end
 
   end

data/tests/rackspace/requests/compute/image_tests.rb

@@ -10,42 +10,44 @@ Shindo.tests('Fog::Compute[:rackspace] | image requests', ['rackspace']) do
     'updated'   => String
   }
 
+  @service = Fog::Compute.new(:provider => :rackspace, :version => :v1)  
+
   tests('success') do
 
-    @server = Fog::Compute[:rackspace].servers.create(:flavor_id => 1, :image_id => 19)
+    @server =  @service.servers.create(:flavor_id => 1, :image_id => 19)
     @server.wait_for { ready? }
     @image_id = nil
 
     tests("#create_image(#{@server.id})").formats(@image_format) do
-      data = Fog::Compute[:rackspace].create_image(@server.id).body['image']
+      data =  @service.create_image(@server.id).body['image']
       @image_id = data['id']
       data
     end
 
     unless Fog.mocking?
-      Fog::Compute[:rackspace].images.get(@image_id).wait_for { ready? }
+       @service.images.get(@image_id).wait_for { ready? }
     end
 
     tests("#get_image_details(#{@image_id})").formats(@image_format) do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].get_image_details(@image_id).body['image']
+       @service.get_image_details(@image_id).body['image']
     end
 
     tests('#list_images').formats({'images' => [Rackspace::Compute::Formats::SUMMARY]}) do
-      Fog::Compute[:rackspace].list_images.body
+       @service.list_images.body
     end
 
     tests('#list_images_detail').formats({'images' => [@image_format]}) do
-      Fog::Compute[:rackspace].list_images_detail.body
+       @service.list_images_detail.body
     end
 
     unless Fog.mocking?
-      Fog::Compute[:rackspace].images.get(@image_id).wait_for { ready? }
+       @service.images.get(@image_id).wait_for { ready? }
     end
 
     tests("#delete_image(#{@image_id})").succeeds do
       pending if Fog.mocking? # because it will fail without the wait just above here, which won't work
-      Fog::Compute[:rackspace].delete_image(@image_id)
+       @service.delete_image(@image_id)
     end
 
     @server.destroy
@@ -55,12 +57,12 @@ Shindo.tests('Fog::Compute[:rackspace] | image requests', ['rackspace']) do
   tests('failure') do
 
     tests('#delete_image(0)').raises(Excon::Errors::BadRequest) do
-      Fog::Compute[:rackspace].delete_image(0)
+       @service.delete_image(0)
     end
 
     tests('#get_image_details(0)').raises(Fog::Compute::Rackspace::NotFound) do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].get_image_details(0)
+       @service.get_image_details(0)
     end
 
   end

data/tests/rackspace/requests/compute/resize_tests.rb

@@ -1,27 +1,29 @@
 Shindo.tests('Fog::Compute[:rackspace] | resize request', ['rackspace']) do
 
-    @confirm_server = Fog::Compute[:rackspace].servers.create(:flavor_id => 1, :image_id => 19)
+    @service = Fog::Compute.new(:provider => :rackspace, :version => :v1)
 
-    @revert_server = Fog::Compute[:rackspace].servers.create(:flavor_id => 1, :image_id => 19)
+    @confirm_server =  @service.servers.create(:flavor_id => 1, :image_id => 19)
+
+    @revert_server =  @service.servers.create(:flavor_id => 1, :image_id => 19)
 
     @confirm_server.wait_for { ready? }
     tests("#resize_server(#{@confirm_server.id}, 2) # to confirm").succeeds do
-      Fog::Compute[:rackspace].resize_server(@confirm_server.id, 2)
+       @service.resize_server(@confirm_server.id, 2)
     end
 
     @revert_server.wait_for { ready? }
     tests("#resize_server(#{@revert_server.id}, 2) # to revert").succeeds do
-      Fog::Compute[:rackspace].resize_server(@revert_server.id, 2)
+       @service.resize_server(@revert_server.id, 2)
     end
 
     @confirm_server.wait_for { state == 'VERIFY_RESIZE' }
     tests("#confirm_resized_server(#{@confirm_server.id})").succeeds do
-      Fog::Compute[:rackspace].confirm_resized_server(@confirm_server.id)
+       @service.confirm_resized_server(@confirm_server.id)
     end
 
     @revert_server.wait_for { state == 'VERIFY_RESIZE' }
     tests("#revert_resized_server(#{@revert_server.id})").succeeds do
-      Fog::Compute[:rackspace].revert_resized_server(@revert_server.id)
+       @service.revert_resized_server(@revert_server.id)
     end
 
     @confirm_server.wait_for { ready? }

data/tests/rackspace/requests/compute/server_tests.rb

@@ -14,6 +14,8 @@ Shindo.tests('Fog::Compute[:rackspace] | server requests', ['rackspace']) do
     'progress'  => Integer,
     'status'    => String
   }
+  
+  @service = Fog::Compute.new(:provider => :rackspace, :version => :v1)  
 
   tests('success') do
 
@@ -21,49 +23,49 @@ Shindo.tests('Fog::Compute[:rackspace] | server requests', ['rackspace']) do
 
     tests('#create_server(1, 19)').formats(@server_format.merge('adminPass' => String)) do
       # 1 => 256MB, 19 => Gentoo
-      data = Fog::Compute[:rackspace].create_server(1, 19).body['server']
+      data =  @service.create_server(1, 19).body['server']
       @server_id = data['id']
       data
     end
 
-    Fog::Compute[:rackspace].servers.get(@server_id).wait_for { ready? }
+     @service.servers.get(@server_id).wait_for { ready? }
 
     tests("#get_server_details(#{@server_id})").formats(@server_format) do
-      Fog::Compute[:rackspace].get_server_details(@server_id).body['server']
+       @service.get_server_details(@server_id).body['server']
     end
 
     tests('#list_servers').formats({'servers' => [Rackspace::Compute::Formats::SUMMARY]}) do
-      Fog::Compute[:rackspace].list_servers.body
+       @service.list_servers.body
     end
 
     tests('#list_servers_detail').formats({'servers' => [@server_format]}) do
-      Fog::Compute[:rackspace].list_servers_detail.body
+       @service.list_servers_detail.body
     end
 
-    Fog::Compute[:rackspace].servers.get(@server_id).wait_for { ready? }
+     @service.servers.get(@server_id).wait_for { ready? }
 
     tests("#update_server(#{@server_id}, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')").succeeds do
-      Fog::Compute[:rackspace].update_server(@server_id, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
+       @service.update_server(@server_id, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
     end
 
-    Fog::Compute[:rackspace].servers.get(@server_id).wait_for { ready? }
+     @service.servers.get(@server_id).wait_for { ready? }
 
     tests("#reboot_server(#{@server_id}, 'HARD')").succeeds do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].reboot_server(@server_id, 'HARD')
+       @service.reboot_server(@server_id, 'HARD')
     end
 
-    Fog::Compute[:rackspace].servers.get(@server_id).wait_for { ready? }
+     @service.servers.get(@server_id).wait_for { ready? }
 
     tests("#reboot_server(#{@server_id}, 'SOFT')").succeeds do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].reboot_server(@server_id, 'SOFT')
+       @service.reboot_server(@server_id, 'SOFT')
     end
 
-    Fog::Compute[:rackspace].servers.get(@server_id).wait_for { ready? }
+     @service.servers.get(@server_id).wait_for { ready? }
 
     tests("#delete_server(#{@server_id})").succeeds do
-      Fog::Compute[:rackspace].delete_server(@server_id)
+       @service.delete_server(@server_id)
     end
 
   end
@@ -71,20 +73,20 @@ Shindo.tests('Fog::Compute[:rackspace] | server requests', ['rackspace']) do
   tests('failure') do
 
     tests('#delete_server(0)').raises(Fog::Compute::Rackspace::NotFound) do
-      Fog::Compute[:rackspace].delete_server(0)
+       @service.delete_server(0)
     end
 
     tests('#get_server_details(0)').raises(Fog::Compute::Rackspace::NotFound) do
-      Fog::Compute[:rackspace].get_server_details(0)
+       @service.get_server_details(0)
     end
 
     tests("#update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')").raises(Fog::Compute::Rackspace::NotFound) do
-      Fog::Compute[:rackspace].update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
+       @service.update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
     end
 
     tests('#reboot_server(0)').raises(Fog::Compute::Rackspace::NotFound) do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].reboot_server(0)
+       @service.reboot_server(0)
     end
 
   end