fog 0.8.2 → 0.9.0

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

@@ -1,4 +1,4 @@
-Shindo.tests('Brightbox::Compute | image requests', ['brightbox']) do
+Shindo.tests('Fog::Compute[:brightbox] | image requests', ['brightbox']) do
 
   tests('success') do
 
@@ -8,34 +8,34 @@ Shindo.tests('Brightbox::Compute | image requests', ['brightbox']) do
     #   "source" => "fnord"
     # }
     # tests("#create_image(#{creation_options.inspect})").formats(Brightbox::Compute::Formats::Full::IMAGE) do
-    #   data = Brightbox[:compute].create_image(creation_options)
+    #   data = Fog::Compute[:brightbox].create_image(creation_options)
     #   @image_id = data["id"]
     #   data
     # end
 
-    # Brightbox[:compute].images.get(@image_id).wait_for { ready? }
+    # Fog::Compute[:brightbox].images.get(@image_id).wait_for { ready? }
 
     tests("#list_images").formats(Brightbox::Compute::Formats::Collection::IMAGES) do
       pending if Fog.mocking?
-      data = Brightbox[:compute].list_images
+      data = Fog::Compute[:brightbox].list_images
       @image_id = data.first["id"]
       data
     end
 
     tests("#get_image('#{@image_id}')").formats(Brightbox::Compute::Formats::Full::IMAGE) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_image(@image_id)
+      Fog::Compute[:brightbox].get_image(@image_id)
     end
 
     ## Until Image creation can be automated, we shouldn't be updating Images randomly
     # update_options = {}
     # tests("#update_image('#{@image_id}', #{update_options.inspect})").formats(Brightbox::Compute::Formats::Full::IMAGE) do
-    #   Brightbox[:compute].update_image(@image_id, :name => "New name from Fog test")
+    #   Fog::Compute[:brightbox].update_image(@image_id, :name => "New name from Fog test")
     # end
 
     ## Same as other tests - can't be deleting them unless part of the test run
     # tests("#destroy_server('#{@image_id}')").formats(Brightbox::Compute::Formats::Full::IMAGE) do
-    #   Brightbox[:compute].destroy_image(@image_id)
+    #   Fog::Compute[:brightbox].destroy_image(@image_id)
     # end
 
   end
@@ -44,12 +44,12 @@ Shindo.tests('Brightbox::Compute | image requests', ['brightbox']) do
 
     tests("#get_image('img-00000')").raises(Excon::Errors::NotFound) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_image('img-00000')
+      Fog::Compute[:brightbox].get_image('img-00000')
     end
 
     tests("#get_image").raises(ArgumentError) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_image
+      Fog::Compute[:brightbox].get_image
     end
 
   end

data/tests/compute/requests/brightbox/interface_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Brightbox::Compute | interface requests', ['brightbox']) do
+Shindo.tests('Fog::Compute[:brightbox] | interface requests', ['brightbox']) do
 
   tests('success') do
 

data/tests/compute/requests/brightbox/load_balancer_tests.rb

@@ -1,9 +1,9 @@
-Shindo.tests('Brightbox::Compute | load balancer requests', ['brightbox']) do
+Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox']) do
 
   tests('success') do
 
     unless Fog.mocking?
-      @node = Brightbox[:compute].servers.create(:image_id => Brightbox::Compute::TestSupport::IMAGE_IDENTIFER)
+      @node = Fog::Compute[:brightbox].servers.create(:image_id => Brightbox::Compute::TestSupport::IMAGE_IDENTIFER)
       node_id = @node.id
     end
 
@@ -24,27 +24,27 @@ Shindo.tests('Brightbox::Compute | load balancer requests', ['brightbox']) do
 
     tests("#create_load_balancer(#{creation_args.inspect})").formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) do
       pending if Fog.mocking?
-      data = Brightbox[:compute].create_load_balancer(creation_args)
+      data = Fog::Compute[:brightbox].create_load_balancer(creation_args)
       @load_balancer_id = data["id"]
       data
     end
 
     unless Fog.mocking?
-      Brightbox[:compute].load_balancers.get(@load_balancer_id).wait_for { ready? }
+      Fog::Compute[:brightbox].load_balancers.get(@load_balancer_id).wait_for { ready? }
     end
 
     # tests("#list_load_balancers()").formats(Brightbox::Compute::Formats::Collection::LOAD_BALANCERS) do
-    #   Brightbox[:compute].list_load_balancers
+    #   Fog::Compute[:brightbox].list_load_balancers
     # end
 
     tests("#get_load_balancer('#{@load_balancer_id}')").formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_load_balancer(@load_balancer_id)
+      Fog::Compute[:brightbox].get_load_balancer(@load_balancer_id)
     end
 
     tests("#destroy_load_balancer('#{@load_balancer_id}')").formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER) do
       pending if Fog.mocking?
-      Brightbox[:compute].destroy_load_balancer(@load_balancer_id)
+      Fog::Compute[:brightbox].destroy_load_balancer(@load_balancer_id)
     end
 
     unless Fog.mocking?
@@ -57,17 +57,17 @@ Shindo.tests('Brightbox::Compute | load balancer requests', ['brightbox']) do
 
     tests("#create_load_balancer").raises(Excon::Errors::BadRequest) do
       pending if Fog.mocking?
-      Brightbox[:compute].create_load_balancer
+      Fog::Compute[:brightbox].create_load_balancer
     end
 
     tests("#get_load_balancer('lba-00000')").raises(Excon::Errors::NotFound) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_load_balancer('lba-00000')
+      Fog::Compute[:brightbox].get_load_balancer('lba-00000')
     end
 
     tests("#get_load_balancer").raises(ArgumentError) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_load_balancer
+      Fog::Compute[:brightbox].get_load_balancer
     end
   end
 

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

@@ -1,4 +1,4 @@
-Shindo.tests('Brightbox::Compute | server requests', ['brightbox']) do
+Shindo.tests('Fog::Compute[:brightbox] | server requests', ['brightbox']) do
 
   tests('success') do
 
@@ -7,53 +7,53 @@ Shindo.tests('Brightbox::Compute | server requests', ['brightbox']) do
 
     tests("#create_server(:image => '#{image_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
       pending if Fog.mocking?
-      data = Brightbox[:compute].create_server(:image => image_id)
+      data = Fog::Compute[:brightbox].create_server(:image => image_id)
       server_id = data["id"]
       data
     end
 
     unless Fog.mocking?
-      Brightbox[:compute].servers.get(server_id).wait_for { ready? }
+      Fog::Compute[:brightbox].servers.get(server_id).wait_for { ready? }
     end
 
     tests("#list_servers").formats(Brightbox::Compute::Formats::Collection::SERVERS) do
       pending if Fog.mocking?
-      Brightbox[:compute].list_servers
+      Fog::Compute[:brightbox].list_servers
     end
 
     tests("#get_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_server(server_id)
+      Fog::Compute[:brightbox].get_server(server_id)
     end
 
     tests("#update_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
       pending if Fog.mocking?
-      Brightbox[:compute].update_server(server_id, :name => "New name from Fog test")
+      Fog::Compute[:brightbox].update_server(server_id, :name => "New name from Fog test")
     end
 
     tests("#activate_console_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
       pending if Fog.mocking?
-      Brightbox[:compute].activate_console_server(server_id)
+      Fog::Compute[:brightbox].activate_console_server(server_id)
     end
 
     tests("#stop_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
       pending if Fog.mocking?
-      Brightbox[:compute].stop_server(server_id)
+      Fog::Compute[:brightbox].stop_server(server_id)
     end
 
     tests("#start_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
       pending if Fog.mocking?
-      Brightbox[:compute].start_server(server_id)
+      Fog::Compute[:brightbox].start_server(server_id)
     end
 
     tests("#shutdown_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
       pending if Fog.mocking?
-      Brightbox[:compute].shutdown_server(server_id)
+      Fog::Compute[:brightbox].shutdown_server(server_id)
     end
 
     tests("#destroy_server('#{server_id}')").formats(Brightbox::Compute::Formats::Full::SERVER) do
       pending if Fog.mocking?
-      Brightbox[:compute].destroy_server(server_id)
+      Fog::Compute[:brightbox].destroy_server(server_id)
     end
 
   end
@@ -62,12 +62,12 @@ Shindo.tests('Brightbox::Compute | server requests', ['brightbox']) do
 
     tests("#get_server('srv-00000')").raises(Excon::Errors::NotFound) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_server('srv-00000')
+      Fog::Compute[:brightbox].get_server('srv-00000')
     end
 
     tests("#get_server").raises(ArgumentError) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_server
+      Fog::Compute[:brightbox].get_server
     end
 
   end

data/tests/compute/requests/brightbox/server_type_tests.rb

@@ -1,17 +1,17 @@
-Shindo.tests('Brightbox::Compute | server type requests', ['brightbox']) do
+Shindo.tests('Fog::Compute[:brightbox] | server type requests', ['brightbox']) do
 
   tests('success') do
 
     tests("#list_server_types").formats(Brightbox::Compute::Formats::Collection::SERVER_TYPES) do
       pending if Fog.mocking?
-      data = Brightbox[:compute].list_server_types
+      data = Fog::Compute[:brightbox].list_server_types
       @server_type_id = data.first["id"]
       data
     end
 
     tests("#get_server_type('#{@server_type_id}')").formats(Brightbox::Compute::Formats::Full::SERVER_TYPE) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_server_type(@server_type_id)
+      Fog::Compute[:brightbox].get_server_type(@server_type_id)
     end
 
   end
@@ -20,12 +20,12 @@ Shindo.tests('Brightbox::Compute | server type requests', ['brightbox']) do
 
     tests("#get_server_type('typ-00000')").raises(Excon::Errors::NotFound) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_server_type('typ-00000')
+      Fog::Compute[:brightbox].get_server_type('typ-00000')
     end
 
     tests("#get_server").raises(ArgumentError) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_server_type
+      Fog::Compute[:brightbox].get_server_type
     end
 
   end

data/tests/compute/requests/brightbox/user_tests.rb

@@ -1,17 +1,17 @@
-Shindo.tests('Brightbox::Compute | user requests', ['brightbox']) do
+Shindo.tests('Fog::Compute[:brightbox] | user requests', ['brightbox']) do
 
   tests('success') do
 
     tests("#list_users").formats(Brightbox::Compute::Formats::Collection::USERS) do
       pending if Fog.mocking?
-      data = Brightbox[:compute].list_users
+      data = Fog::Compute[:brightbox].list_users
       @user_id = data.first["id"]
       data
     end
 
     tests("#get_user('#{@user_id}')").formats(Brightbox::Compute::Formats::Full::USER) do
       pending if Fog.mocking?
-      data = Brightbox[:compute].get_user(@user_id)
+      data = Fog::Compute[:brightbox].get_user(@user_id)
       @original_name = data["name"]
       data
     end
@@ -20,11 +20,11 @@ Shindo.tests('Brightbox::Compute | user requests', ['brightbox']) do
 
     tests("#update_user('#{@user_id}', #{update_options.inspect})").formats(Brightbox::Compute::Formats::Full::USER) do
       pending if Fog.mocking?
-      Brightbox[:compute].update_user(@user_id, update_options)
+      Fog::Compute[:brightbox].update_user(@user_id, update_options)
     end
 
     unless Fog.mocking?
-      Brightbox[:compute].update_user(@user_id, :name => @original_name)
+      Fog::Compute[:brightbox].update_user(@user_id, :name => @original_name)
     end
 
   end
@@ -33,7 +33,7 @@ Shindo.tests('Brightbox::Compute | user requests', ['brightbox']) do
 
     tests("#update_user").raises(ArgumentError) do
       pending if Fog.mocking?
-      Brightbox[:compute].update_user
+      Fog::Compute[:brightbox].update_user
     end
 
   end

data/tests/compute/requests/brightbox/zone_tests.rb

@@ -1,17 +1,17 @@
-Shindo.tests('Brightbox::Compute | zone requests', ['brightbox']) do
+Shindo.tests('Fog::Compute[:brightbox] | zone requests', ['brightbox']) do
 
   tests('success') do
 
     tests("#list_zones").formats(Brightbox::Compute::Formats::Collection::ZONES) do
       pending if Fog.mocking?
-      data = Brightbox[:compute].list_zones
+      data = Fog::Compute[:brightbox].list_zones
       @zone_id = data.first["id"]
       data
     end
 
     tests("#get_zone('#{@zone_id}')").formats(Brightbox::Compute::Formats::Full::ZONE) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_zone(@zone_id)
+      Fog::Compute[:brightbox].get_zone(@zone_id)
     end
 
   end
@@ -20,12 +20,12 @@ Shindo.tests('Brightbox::Compute | zone requests', ['brightbox']) do
 
     tests("#get_zone('zon-00000')").raises(Excon::Errors::NotFound) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_zone('zon-00000')
+      Fog::Compute[:brightbox].get_zone('zon-00000')
     end
 
     tests("#get_zone").raises(ArgumentError) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_zone
+      Fog::Compute[:brightbox].get_zone
     end
 
   end

data/tests/compute/requests/linode/datacenter_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Linode::Compute | datacenter requests', ['linode']) do
+Shindo.tests('Fog::Compute[:linode] | datacenter requests', ['linode']) do
 
   @datacenters_format = Linode::Compute::Formats::BASIC.merge({
     'DATA' => [{ 
@@ -11,7 +11,7 @@ Shindo.tests('Linode::Compute | datacenter requests', ['linode']) do
 
     tests('#avail_datacenters').formats(@datacenters_format) do
       pending if Fog.mocking?
-      Linode[:compute].avail_datacenters.body
+      Fog::Compute[:linode].avail_datacenters.body
     end
 
   end

data/tests/compute/requests/linode/distribution_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Linode::Compute | distribution requests', ['linode']) do
+Shindo.tests('Fog::Compute[:linode] | distribution requests', ['linode']) do
 
   @distributions_format = Linode::Compute::Formats::BASIC.merge({
     'DATA' => [{ 
@@ -17,14 +17,14 @@ Shindo.tests('Linode::Compute | distribution requests', ['linode']) do
 
     tests('#avail_distributions').formats(@distributions_format) do
       pending if Fog.mocking?
-      data = Linode[:compute].avail_distributions.body
+      data = Fog::Compute[:linode].avail_distributions.body
       @distribution_id = data['DATA'].first['DISTRIBUTIONID']
       data
     end
 
     tests("@avail_distributions(#{@distribution_id})").formats(@distributions_format) do
       pending if Fog.mocking?
-      Linode[:compute].avail_distributions(@distribution_id).body
+      Fog::Compute[:linode].avail_distributions(@distribution_id).body
     end
 
   end

data/tests/compute/requests/linode/kernel_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Linode::Compute | kernel requests', ['linode']) do
+Shindo.tests('Fog::Compute[:linode] | kernel requests', ['linode']) do
 
   @kernels_format = Linode::Compute::Formats::BASIC.merge({
     'DATA' => [{ 
@@ -14,14 +14,14 @@ Shindo.tests('Linode::Compute | kernel requests', ['linode']) do
 
     tests('#avail_kernels').formats(@kernels_format) do
       pending if Fog.mocking?
-      data = Linode[:compute].avail_kernels.body
+      data = Fog::Compute[:linode].avail_kernels.body
       @kernel_id = data['DATA'].first['KERNELID']
       data
     end
 
     tests("@avail_kernels(#{@kernel_id})").formats(@kernels_format) do
       pending if Fog.mocking?
-      Linode[:compute].avail_kernels(@kernel_id).body
+      Fog::Compute[:linode].avail_kernels(@kernel_id).body
     end
   end
 end

data/tests/compute/requests/linode/linode_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Linode::Compute | linode requests', ['linode']) do
+Shindo.tests('Fog::Compute[:linode] | linode requests', ['linode']) do
 
   @linode_format = Linode::Compute::Formats::BASIC.merge({
     'DATA' => { 'LinodeID' => Integer }
@@ -64,78 +64,78 @@ Shindo.tests('Linode::Compute | linode requests', ['linode']) do
     # (2 => Dallas, TX, USA), (1 => 1 month), (1 => Linode 512)
     tests('#linode_create(2, 1, 1)').formats(@linode_format) do
       pending if Fog.mocking?
-      data = Linode[:compute].linode_create(2, 1, 1).body
+      data = Fog::Compute[:linode].linode_create(2, 1, 1).body
       @linode_id = data['DATA']['LinodeID']
       data
     end
 
     tests("#linode_list(#{@linode_id})").formats(@linodes_format) do
       pending if Fog.mocking?
-      Linode[:compute].linode_list(@linode_id).body
+      Fog::Compute[:linode].linode_list(@linode_id).body
     end
 
     tests('#linode_list').formats(@linodes_format) do
       pending if Fog.mocking?      
-      Linode[:compute].linode_list.body
+      Fog::Compute[:linode].linode_list.body
     end
 
     tests('#linode_update').formats(@linode_format) do
       pending if Fog.mocking?
-      Linode[:compute].linode_update(@linode_id, :label => 'testing').body
+      Fog::Compute[:linode].linode_update(@linode_id, :label => 'testing').body
     end
 
     tests('#linode_ip_addprivate').formats(@ip_format) do
       pending if Fog.mocking?
-      Linode[:compute].linode_ip_addprivate(@linode_id).body
+      Fog::Compute[:linode].linode_ip_addprivate(@linode_id).body
     end
 
     tests('#linode_disk_create').formats(@disk_format) do
       pending if Fog.mocking?
-      data = Linode[:compute].linode_disk_create(@linode_id, 'test1', 'ext3', 1).body
+      data = Fog::Compute[:linode].linode_disk_create(@linode_id, 'test1', 'ext3', 1).body
       @disk1_id = data['DATA']['DiskID']
       data
     end    
 
     tests('#linode_disk_createfromdistribution').formats(@disk_format) do
       pending if Fog.mocking?
-      data = Linode[:compute].linode_disk_createfromdistribution(@linode_id, 73, 'test1', 600, 'P@SSW)RD').body
+      data = Fog::Compute[:linode].linode_disk_createfromdistribution(@linode_id, 73, 'test1', 600, 'P@SSW)RD').body
       @disk2_id = data['DATA']['DiskID']
       data
     end
 
     tests('#linode_disk_list').formats(@disks_format) do
       pending if Fog.mocking?
-      Linode[:compute].linode_disk_list(@linode_id).body
+      Fog::Compute[:linode].linode_disk_list(@linode_id).body
     end
 
     # tests("#linode_reboot(#{@linode_id})").formats(@reboot_format) do
-    #   Linode[:compute].linode_reboot(@linode_id).body
+    #   Fog::Compute[:linode].linode_reboot(@linode_id).body
     # end    
 
     tests('#linode_disk_delete').formats(@disk_format) do
       pending if Fog.mocking?
-      Linode[:compute].linode_disk_delete(@linode_id, @disk1_id).body
-      Linode[:compute].linode_disk_delete(@linode_id, @disk2_id).body
+      Fog::Compute[:linode].linode_disk_delete(@linode_id, @disk1_id).body
+      Fog::Compute[:linode].linode_disk_delete(@linode_id, @disk2_id).body
     end
 
     tests('#linode_delete(#{@linode_id})').succeeds do
       pending if Fog.mocking?
-      sleep 1 until Linode[:compute].linode_disk_list(@linode_id).body['DATA'].size == 0
-      Linode[:compute].linode_delete(@linode_id)
+      sleep 1 until Fog::Compute[:linode].linode_disk_list(@linode_id).body['DATA'].size == 0
+      Fog::Compute[:linode].linode_delete(@linode_id)
     end
 
   end
 
   tests('failure') do
 
-    tests('#linode_reboot(0)').raises(Fog::Linode::Compute::NotFound) do
+    tests('#linode_reboot(0)').raises(Fog::Compute::Linode::NotFound) do
       pending if Fog.mocking?
-      Linode[:compute].linode_reboot(1)
+      Fog::Compute[:linode].linode_reboot(1)
     end
 
-    tests('#linode_delete(0)').raises(Fog::Linode::Compute::NotFound) do
+    tests('#linode_delete(0)').raises(Fog::Compute::Linode::NotFound) do
       pending if Fog.mocking?
-      Linode[:compute].linode_delete(1)
+      Fog::Compute[:linode].linode_delete(1)
     end
 
   end