fog 0.8.2 → 0.9.0

data/tests/compute/requests/aws/volume_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('AWS::Compute | volume requests', ['aws']) do
+Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
 
   @volume_format = {
     'availabilityZone'  => String,
@@ -33,7 +33,7 @@ Shindo.tests('AWS::Compute | volume requests', ['aws']) do
     'requestId' => String
   }
 
-  @server = AWS[:compute].servers.create
+  @server = Fog::Compute[:aws].servers.create
   @server.wait_for { ready? }
 
   tests('success') do
@@ -41,56 +41,72 @@ Shindo.tests('AWS::Compute | volume requests', ['aws']) do
     @volume_id = nil
 
     tests('#create_volume').formats(@volume_format) do
-      data = AWS[:compute].create_volume(@server.availability_zone, 1).body
+      data = Fog::Compute[:aws].create_volume(@server.availability_zone, 1).body
       @volume_id = data['volumeId']
       data
     end
 
-    AWS[:compute].volumes.get(@volume_id).wait_for { ready? }
+    tests('#create_volume from snapshot').formats(@volume_format) do
+      volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1d', :size => 1)
+      snapshot = Fog::Compute[:aws].create_snapshot(volume.identity).body
+      data = Fog::Compute[:aws].create_volume(@server.availability_zone, nil, snapshot['snapshotId']).body
+      @volume_id = data['volumeId']
+      data
+    end
+
+    tests('#create_volume from snapshot with size').formats(@volume_format) do
+      volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1d', :size => 1)
+      snapshot = Fog::Compute[:aws].create_snapshot(volume.identity).body
+      data = Fog::Compute[:aws].create_volume(@server.availability_zone, 1, snapshot['snapshotId']).body
+      @volume_id = data['volumeId']
+      data
+    end
+
+    Fog::Compute[:aws].volumes.get(@volume_id).wait_for { ready? }
 
     tests('#describe_volumes').formats(@volumes_format) do
-      AWS[:compute].describe_volumes.body
+      Fog::Compute[:aws].describe_volumes.body
     end
 
     tests("#describe_volumes('volume-id' => #{@volume_id})").formats(@volumes_format) do
-      AWS[:compute].describe_volumes('volume-id' => @volume_id).body
+      Fog::Compute[:aws].describe_volumes('volume-id' => @volume_id).body
     end
 
     tests("#attach_volume(#{@server.identity}, #{@volume_id}, '/dev/sdh')").formats(@volume_attachment_format) do
-      AWS[:compute].attach_volume(@server.identity, @volume_id, '/dev/sdh').body
+      Fog::Compute[:aws].attach_volume(@server.identity, @volume_id, '/dev/sdh').body
     end
 
-    AWS[:compute].volumes.get(@volume_id).wait_for { state == 'in-use' }
+    Fog::Compute[:aws].volumes.get(@volume_id).wait_for { state == 'in-use' }
 
     tests("#detach_volume('#{@volume_id}')").formats(@volume_attachment_format) do
-      AWS[:compute].detach_volume(@volume_id).body
+      Fog::Compute[:aws].detach_volume(@volume_id).body
     end
 
-    AWS[:compute].volumes.get(@volume_id).wait_for { ready? }
+    Fog::Compute[:aws].volumes.get(@volume_id).wait_for { ready? }
 
     tests("#delete_volume('#{@volume_id}')").formats(AWS::Compute::Formats::BASIC) do
-      AWS[:compute].delete_volume(@volume_id).body
+      Fog::Compute[:aws].delete_volume(@volume_id).body
     end
 
   end
-  tests ('failure') do
+  tests('failure') do
 
-    @volume = AWS[:compute].volumes.create(:availability_zone => @server.availability_zone, :size => 1)
+    @volume = Fog::Compute[:aws].volumes.create(:availability_zone => @server.availability_zone, :size => 1)
 
-    tests("#attach_volume('i-00000000', '#{@volume.identity}', '/dev/sdh')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].attach_volume('i-00000000', @volume.identity, '/dev/sdh')
+    tests("#attach_volume('i-00000000', '#{@volume.identity}', '/dev/sdh')").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].attach_volume('i-00000000', @volume.identity, '/dev/sdh')
     end
 
-    tests("#attach_volume('#{@server.identity}', 'vol-00000000', '/dev/sdh')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].attach_volume(@server.identity, 'vol-00000000', '/dev/sdh')
+    tests("#attach_volume('#{@server.identity}', 'vol-00000000', '/dev/sdh')").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].attach_volume(@server.identity, 'vol-00000000', '/dev/sdh')
     end
 
-    tests("#detach_volume('vol-00000000')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].detach_volume('vol-00000000')
+    tests("#detach_volume('vol-00000000')").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].detach_volume('vol-00000000')
     end
 
-    tests("#delete_volume('vol-00000000')").raises(Fog::AWS::Compute::NotFound) do
-      AWS[:compute].delete_volume('vol-00000000')
+    tests("#delete_volume('vol-00000000')").raises(Fog::Compute::AWS::NotFound) do
+      Fog::Compute[:aws].delete_volume('vol-00000000')
     end
 
     @volume.destroy

data/tests/compute/requests/bluebox/block_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Bluebox::Compute | block requests', ['bluebox']) do
+Shindo.tests('Fog::Compute[:bluebox] | block requests', ['bluebox']) do
 
   @block_format = {
     'cpu'             => Float,
@@ -17,63 +17,63 @@ Shindo.tests('Bluebox::Compute | block requests', ['bluebox']) do
   tests('success') do
 
     @product_id   = '94fd37a7-2606-47f7-84d5-9000deda52ae' # 1 GB
-    @template_id  = compute_providers[Bluebox][:server_attributes][:image_id]
+    @template_id  = compute_providers[:bluebox][:server_attributes][:image_id]
     @password     = 'chunkybacon'
 
     @block_id = nil
 
     tests("create_block('#{@product_id}', '#{@template_id}', {'password' => '#{@password}'})").formats(@block_format.merge('add_to_lb_application_results' => {'text' => String})) do
       pending if Fog.mocking?
-      data = Bluebox[:compute].create_block(@product_id, @template_id, {'password' => @password}).body
+      data = Fog::Compute[:bluebox].create_block(@product_id, @template_id, {'password' => @password}).body
       @block_id = data['id']
       data
     end
 
     unless Fog.mocking?
-      Bluebox[:compute].servers.get(@block_id).wait_for { ready? }
+      Fog::Compute[:bluebox].servers.get(@block_id).wait_for { ready? }
     end
 
     tests("get_block('#{@block_id}')").formats(@block_format) do
       pending if Fog.mocking?
-      Bluebox[:compute].get_block(@block_id).body
+      Fog::Compute[:bluebox].get_block(@block_id).body
     end
 
     tests("get_blocks").formats([@block_format.reject {|key,value| ['product', 'template'].include?(key)}]) do
       pending if Fog.mocking?
-      Bluebox[:compute].get_blocks.body
+      Fog::Compute[:bluebox].get_blocks.body
     end
 
     tests("reboot_block('#{@block_id}')").formats({'status' => String, 'text' => String}) do
       pending if Fog.mocking?
-      Bluebox[:compute].reboot_block(@block_id).body
+      Fog::Compute[:bluebox].reboot_block(@block_id).body
     end
 
     unless Fog.mocking?
-      Bluebox[:compute].servers.get(@block_id).wait_for { ready? }
+      Fog::Compute[:bluebox].servers.get(@block_id).wait_for { ready? }
     end
 
     tests("destroy_block('#{@block_id})'").formats({'text' => String}) do
       pending if Fog.mocking?
-      Bluebox[:compute].destroy_block(@block_id).body
+      Fog::Compute[:bluebox].destroy_block(@block_id).body
     end
 
   end
 
   tests('failure') do
 
-    tests("get_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+    tests("get_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Compute::Bluebox::NotFound) do
       pending if Fog.mocking?
-      Bluebox[:compute].get_block('00000000-0000-0000-0000-000000000000')
+      Fog::Compute[:bluebox].get_block('00000000-0000-0000-0000-000000000000')
     end
 
-    tests("reboot_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+    tests("reboot_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Compute::Bluebox::NotFound) do
       pending if Fog.mocking?
-      Bluebox[:compute].reboot_block('00000000-0000-0000-0000-000000000000')
+      Fog::Compute[:bluebox].reboot_block('00000000-0000-0000-0000-000000000000')
     end
 
-    tests("destroy_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+    tests("destroy_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Compute::Bluebox::NotFound) do
       pending if Fog.mocking?
-      Bluebox[:compute].destroy_block('00000000-0000-0000-0000-000000000000')
+      Fog::Compute[:bluebox].destroy_block('00000000-0000-0000-0000-000000000000')
     end
 
   end

data/tests/compute/requests/bluebox/helper.rb

@@ -5,7 +5,7 @@ class Bluebox
     module Formats
 
       PRODUCT = {
-        'cost'        => Float,
+        'cost'        => String,
         'description' => String,
         'id'          => String
       }

data/tests/compute/requests/bluebox/product_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Bluebox::Compute | product requests', ['bluebox']) do
+Shindo.tests('Fog::Compute[:bluebox] | product requests', ['bluebox']) do
 
   tests('success') do
 
@@ -6,21 +6,21 @@ Shindo.tests('Bluebox::Compute | product requests', ['bluebox']) do
 
     tests("get_product('#{@product_id}')").formats(Bluebox::Compute::Formats::PRODUCT) do
       pending if Fog.mocking?
-      Bluebox[:compute].get_product(@product_id).body
+      Fog::Compute[:bluebox].get_product(@product_id).body
     end
 
     tests("get_products").formats([Bluebox::Compute::Formats::PRODUCT]) do
       pending if Fog.mocking?
-      Bluebox[:compute].get_products.body
+      Fog::Compute[:bluebox].get_products.body
     end
 
   end
 
   tests('failure') do
 
-    tests("get_product('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+    tests("get_product('00000000-0000-0000-0000-000000000000')").raises(Fog::Compute::Bluebox::NotFound) do
       pending if Fog.mocking?
-      Bluebox[:compute].get_product('00000000-0000-0000-0000-000000000000')
+      Fog::Compute[:bluebox].get_product('00000000-0000-0000-0000-000000000000')
     end
 
   end

data/tests/compute/requests/bluebox/template_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Bluebox::Compute | template requests', ['bluebox']) do
+Shindo.tests('Fog::Compute[:bluebox] | template requests', ['bluebox']) do
 
   @template_format = {
     'created'     => String,
@@ -9,25 +9,25 @@ Shindo.tests('Bluebox::Compute | template requests', ['bluebox']) do
 
   tests('success') do
 
-    @template_id  = 'a00baa8f-b5d0-4815-8238-b471c4c4bf72' # Ubuntu 9.10 64bit
+    @template_id  = '03807e08-a13d-44e4-b011-ebec7ef2c928' # Ubuntu LTS 10.04 64bit
 
     tests("get_template('#{@template_id}')").formats(@template_format) do
       pending if Fog.mocking?
-      Bluebox[:compute].get_template(@template_id).body
+      Fog::Compute[:bluebox].get_template(@template_id).body
     end
 
     tests("get_templates").formats([@template_format]) do
       pending if Fog.mocking?
-      Bluebox[:compute].get_templates.body
+      Fog::Compute[:bluebox].get_templates.body
     end
 
   end
 
   tests('failure') do
 
-    tests("get_template('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+    tests("get_template('00000000-0000-0000-0000-000000000000')").raises(Fog::Compute::Bluebox::NotFound) do
       pending if Fog.mocking?
-      Bluebox[:compute].get_template('00000000-0000-0000-0000-000000000000')
+      Fog::Compute[:bluebox].get_template('00000000-0000-0000-0000-000000000000')
     end
 
   end

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

@@ -1,29 +1,29 @@
-Shindo.tests('Brightbox::Compute | account requests', ['brightbox']) do
+Shindo.tests('Fog::Compute[:brightbox] | account requests', ['brightbox']) do
 
   tests('success') do
 
     tests("#get_account").formats(Brightbox::Compute::Formats::Full::ACCOUNT) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_account
+      Fog::Compute[:brightbox].get_account
     end
 
     unless Fog.mocking?
-      original_name = Brightbox[:compute].get_account["name"]
+      original_name = Fog::Compute[:brightbox].get_account["name"]
       update_args = {:name => "New name from Fog test"}
     end
 
     tests("#update_account(#{update_args.inspect})").formats(Brightbox::Compute::Formats::Full::ACCOUNT) do
       pending if Fog.mocking?
-      Brightbox[:compute].update_account(update_args)
+      Fog::Compute[:brightbox].update_account(update_args)
     end
 
     unless Fog.mocking?
-      Brightbox[:compute].update_account(:name => original_name)
+      Fog::Compute[:brightbox].update_account(:name => original_name)
     end
 
     tests("#reset_ftp_password_account").formats(Brightbox::Compute::Formats::Full::ACCOUNT) do
       pending if Fog.mocking?
-      Brightbox[:compute].reset_ftp_password_account
+      Fog::Compute[:brightbox].reset_ftp_password_account
     end
 
   end
@@ -32,7 +32,7 @@ Shindo.tests('Brightbox::Compute | account requests', ['brightbox']) do
 
     tests("#update_account").returns(nil) do
       pending if Fog.mocking?
-      Brightbox[:compute].update_account
+      Fog::Compute[:brightbox].update_account
     end
 
   end

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

@@ -1,4 +1,4 @@
-Shindo.tests('Brightbox::Compute | api client requests', ['brightbox']) do
+Shindo.tests('Fog::Compute[:brightbox] | api client requests', ['brightbox']) do
 
   tests('success') do
 
@@ -6,29 +6,29 @@ Shindo.tests('Brightbox::Compute | api client requests', ['brightbox']) do
 
     tests("#create_api_client(#{create_options.inspect})").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do
       pending if Fog.mocking?
-      data = Brightbox[:compute].create_api_client(create_options)
+      data = Fog::Compute[:brightbox].create_api_client(create_options)
       @api_client_id = data["id"]
       data
     end
 
     tests("#list_api_clients").formats(Brightbox::Compute::Formats::Collection::API_CLIENTS) do
       pending if Fog.mocking?
-      Brightbox[:compute].list_api_clients
+      Fog::Compute[:brightbox].list_api_clients
     end
 
     tests("#get_api_client('#{@api_client_id}')").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_api_client(@api_client_id)
+      Fog::Compute[:brightbox].get_api_client(@api_client_id)
     end
 
     tests("#update_api_client('#{@api_client_id}')").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do
       pending if Fog.mocking?
-      Brightbox[:compute].update_api_client(@api_client_id, :name => "New name from Fog test")
+      Fog::Compute[:brightbox].update_api_client(@api_client_id, :name => "New name from Fog test")
     end
 
     tests("#destroy_api_client('#{@api_client_id}')").formats(Brightbox::Compute::Formats::Full::API_CLIENT) do
       pending if Fog.mocking?
-      Brightbox[:compute].destroy_api_client(@api_client_id)
+      Fog::Compute[:brightbox].destroy_api_client(@api_client_id)
     end
 
   end
@@ -37,12 +37,12 @@ Shindo.tests('Brightbox::Compute | api client requests', ['brightbox']) do
 
     tests("#get_api_client('cli-00000')").raises(Excon::Errors::NotFound) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_api_client('cli-00000')
+      Fog::Compute[:brightbox].get_api_client('cli-00000')
     end
 
     tests("#get_api_client").raises(ArgumentError) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_api_client
+      Fog::Compute[:brightbox].get_api_client
     end
   end
 

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

@@ -1,26 +1,26 @@
-Shindo.tests('Brightbox::Compute | cloud ip requests', ['brightbox']) do
+Shindo.tests('Fog::Compute[:brightbox] | cloud ip requests', ['brightbox']) do
 
   tests('success') do
 
     unless Fog.mocking?
-      @server = Brightbox[:compute].servers.create(compute_providers[Brightbox][:server_attributes])
+      @server = Fog::Compute[:brightbox].servers.create(compute_providers[:brightbox][:server_attributes])
     end
 
     tests("#create_cloud_ip").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
       pending if Fog.mocking?
-      data = Brightbox[:compute].create_cloud_ip
+      data = Fog::Compute[:brightbox].create_cloud_ip
       @cloud_ip_id = data["id"]
       data
     end
 
     tests("#list_cloud_ips").formats(Brightbox::Compute::Formats::Collection::CLOUD_IPS) do
       pending if Fog.mocking?
-      Brightbox[:compute].list_cloud_ips
+      Fog::Compute[:brightbox].list_cloud_ips
     end
 
     tests("#get_cloud_ip('#{@cloud_ip_id}')").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_cloud_ip(@cloud_ip_id)
+      Fog::Compute[:brightbox].get_cloud_ip(@cloud_ip_id)
     end
 
     unless Fog.mocking?
@@ -30,21 +30,21 @@ Shindo.tests('Brightbox::Compute | cloud ip requests', ['brightbox']) do
 
     tests("#map_cloud_ip('#{@cloud_ip_id}', #{map_options.inspect})").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
       pending if Fog.mocking?
-      Brightbox[:compute].map_cloud_ip(@cloud_ip_id, map_options)
+      Fog::Compute[:brightbox].map_cloud_ip(@cloud_ip_id, map_options)
     end
 
     unless Fog.mocking?
-      Brightbox[:compute].cloud_ips.get(@cloud_ip_id).wait_for { mapped? }
+      Fog::Compute[:brightbox].cloud_ips.get(@cloud_ip_id).wait_for { mapped? }
     end
 
     tests("#unmap_cloud_ip('#{@cloud_ip_id}')").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
       pending if Fog.mocking?
-      Brightbox[:compute].unmap_cloud_ip(@cloud_ip_id)
+      Fog::Compute[:brightbox].unmap_cloud_ip(@cloud_ip_id)
     end
 
     tests("#destroy_cloud_ip('#{@cloud_ip_id}')").formats(Brightbox::Compute::Formats::Full::CLOUD_IP) do
       pending if Fog.mocking?
-      Brightbox[:compute].destroy_cloud_ip(@cloud_ip_id)
+      Fog::Compute[:brightbox].destroy_cloud_ip(@cloud_ip_id)
     end
 
     unless Fog.mocking?
@@ -57,12 +57,12 @@ Shindo.tests('Brightbox::Compute | cloud ip requests', ['brightbox']) do
 
     tests("#get_cloud_ip('cip-00000')").raises(Excon::Errors::NotFound) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_cloud_ip('cip-00000')
+      Fog::Compute[:brightbox].get_cloud_ip('cip-00000')
     end
 
     tests("#get_cloud_ip").raises(ArgumentError) do
       pending if Fog.mocking?
-      Brightbox[:compute].get_cloud_ip
+      Fog::Compute[:brightbox].get_cloud_ip
     end
 
   end

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

@@ -55,13 +55,16 @@ class Brightbox
       module Nested
         ACCOUNT = {
           "name"            => String,
-          "ram_used"        => Integer,
           "resource_type"   => String,
-          "ram_limit"       => Integer,
           "url"             => String,
           "id"              => String,
           "status"          => String,
-          "limits_cloudips" => Integer
+          "ram_limit"       => Integer,
+          "ram_used"        => Integer,
+          "cloud_ips_limit" => Integer,
+          "cloud_ips_used"  => Integer,
+          "load_balancers_limit" => Integer,
+          "load_balancers_used" => Integer
         }
 
         API_CLIENT = {
@@ -69,7 +72,8 @@ class Brightbox
           "resource_type"   => String,
           "url"             => String,
           "name"            => String,
-          "description"     => String
+          "description"     => String,
+          "revoked_at"      => Fog::Nullable::String
         }
 
         CLOUD_IP = {
@@ -149,6 +153,7 @@ class Brightbox
           "url"             => String,
           "name"            => String,
           "description"     => String,
+          "revoked_at"      => Fog::Nullable::String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
         }
 
@@ -162,7 +167,7 @@ class Brightbox
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,
           "interface"       => Fog::Brightbox::Nullable::Interface,
           "load_balancer"   => Fog::Brightbox::Nullable::LoadBalancer,
-          "server"          => Fog::Nullable::String
+          "server"          => Fog::Brightbox::Nullable::Server
         }
 
         IMAGE = {
@@ -266,12 +271,15 @@ class Brightbox
           "created_at"      => String,
           "ram_limit"       => Integer,
           "ram_used"        => Integer,
-          "limits_cloudips" => Integer,
+          "cloud_ips_limit" => Integer,
+          "cloud_ips_used"  => Integer,
+          "load_balancers_limit" => Integer,
+          "load_balancers_used" => Integer,
           "library_ftp_host" => String,
           "library_ftp_user" => String,
           "library_ftp_password" => Fog::Nullable::String,
-          "verified_telephone" => Fog::Nullable::Boolean,
-          "verified_at"     => Fog::Nullable::Time,
+          "verified_telephone" => Fog::Nullable::String,
+          "verified_at"     => Fog::Nullable::String,
           "verified_ip"     => Fog::Nullable::String,
           "owner"           => Brightbox::Compute::Formats::Nested::USER,
           "users"           => [Brightbox::Compute::Formats::Nested::USER],
@@ -287,6 +295,7 @@ class Brightbox
           "url"             => String,
           "name"            => String,
           "description"     => String,
+          "revoked_at"      => Fog::Nullable::String,
           "secret"          => Fog::Nullable::String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT
         }