fog 0.2.30 → 0.3.0

data/tests/aws/requests/{ec2 → compute}/region_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('AWS::EC2 | region requests', ['aws']) do
+Shindo.tests('AWS::Compute | region requests', ['aws']) do
 
   @regions_format = {
     'regionInfo'  => [{
@@ -11,19 +11,19 @@ Shindo.tests('AWS::EC2 | region requests', ['aws']) do
   tests('success') do
 
     tests("#describe_regions").formats(@regions_format) do
-      AWS[:ec2].describe_regions.body
+      AWS[:compute].describe_regions.body
     end
 
     tests("#describe_regions('us-east-1')").formats(@regions_format) do
-      AWS[:ec2].describe_regions('us-east-1').body
+      AWS[:compute].describe_regions('us-east-1').body
     end
 
   end
 
   tests('failure') do
 
-    tests("#describe_regions('us-east-2')").raises(Fog::AWS::EC2::Error) do
-      AWS[:ec2].describe_regions('us-east-2')
+    tests("#describe_regions('us-east-2')").raises(Fog::AWS::Compute::Error) do
+      AWS[:compute].describe_regions('us-east-2')
     end
   end
 

data/tests/aws/requests/{ec2 → compute}/security_group_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('AWS::EC2 | security group requests', ['aws']) do
+Shindo.tests('AWS::Compute | security group requests', ['aws']) do
 
   @security_groups_format = {
     'requestId'           => String,
@@ -16,16 +16,16 @@ Shindo.tests('AWS::EC2 | security group requests', ['aws']) do
     }]
   }
 
-  @owner_id = AWS[:ec2].describe_security_groups('default').body['securityGroupInfo'].first['ownerId']
+  @owner_id = AWS[:compute].describe_security_groups('default').body['securityGroupInfo'].first['ownerId']
 
   tests('success') do
 
-    tests("#create_security_group('fog_security_group', 'tests group')").formats(AWS::EC2::Formats::BASIC) do
-      AWS[:ec2].create_security_group('fog_security_group', 'tests group').body
+    tests("#create_security_group('fog_security_group', 'tests group')").formats(AWS::Compute::Formats::BASIC) do
+      AWS[:compute].create_security_group('fog_security_group', 'tests group').body
     end
 
-    tests("#authorize_security_group_ingress({'FromPort' => 80, 'GroupName' => 'fog_security_group', 'IpProtocol' => 'tcp', 'toPort' => 80})").formats(AWS::EC2::Formats::BASIC) do
-      AWS[:ec2].authorize_security_group_ingress({
+    tests("#authorize_security_group_ingress({'FromPort' => 80, 'GroupName' => 'fog_security_group', 'IpProtocol' => 'tcp', 'toPort' => 80})").formats(AWS::Compute::Formats::BASIC) do
+      AWS[:compute].authorize_security_group_ingress({
         'FromPort' => 80,
         'GroupName' => 'fog_security_group',
         'IpProtocol' => 'tcp',
@@ -33,8 +33,8 @@ Shindo.tests('AWS::EC2 | security group requests', ['aws']) do
       }).body
     end
 
-    tests("#authorize_security_group_ingress({'GroupName' => 'fog_security_group', 'SourceSecurityGroupName' => 'fog_security_group', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").formats(AWS::EC2::Formats::BASIC) do
-      AWS[:ec2].authorize_security_group_ingress({
+    tests("#authorize_security_group_ingress({'GroupName' => 'fog_security_group', 'SourceSecurityGroupName' => 'fog_security_group', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").formats(AWS::Compute::Formats::BASIC) do
+      AWS[:compute].authorize_security_group_ingress({
         'GroupName'                   => 'fog_security_group',
         'SourceSecurityGroupName'     => 'fog_security_group',
         'SourceSecurityGroupOwnerId'  => @owner_id
@@ -42,15 +42,15 @@ Shindo.tests('AWS::EC2 | security group requests', ['aws']) do
     end
 
     tests("#describe_security_groups").formats(@security_groups_format) do
-      AWS[:ec2].describe_security_groups.body
+      AWS[:compute].describe_security_groups.body
     end
 
     tests("#describe_security_groups('fog_security_group')").formats(@security_groups_format) do
-      AWS[:ec2].describe_security_groups('fog_security_group').body
+      AWS[:compute].describe_security_groups('fog_security_group').body
     end
 
-    tests("#revoke_security_group_ingress({'FromPort' => 80, 'GroupName' => 'fog_security_group', 'IpProtocol' => 'tcp', 'toPort' => 80})").formats(AWS::EC2::Formats::BASIC) do
-      AWS[:ec2].revoke_security_group_ingress({
+    tests("#revoke_security_group_ingress({'FromPort' => 80, 'GroupName' => 'fog_security_group', 'IpProtocol' => 'tcp', 'toPort' => 80})").formats(AWS::Compute::Formats::BASIC) do
+      AWS[:compute].revoke_security_group_ingress({
         'FromPort' => 80,
         'GroupName' => 'fog_security_group',
         'IpProtocol' => 'tcp',
@@ -58,29 +58,29 @@ Shindo.tests('AWS::EC2 | security group requests', ['aws']) do
       }).body
     end
 
-    tests("#revoke_security_group_ingress({'GroupName' => 'fog_security_group', 'SourceSecurityGroupName' => 'fog_security_group', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").formats(AWS::EC2::Formats::BASIC) do
-      AWS[:ec2].revoke_security_group_ingress({
+    tests("#revoke_security_group_ingress({'GroupName' => 'fog_security_group', 'SourceSecurityGroupName' => 'fog_security_group', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").formats(AWS::Compute::Formats::BASIC) do
+      AWS[:compute].revoke_security_group_ingress({
         'GroupName'                   => 'fog_security_group',
         'SourceSecurityGroupName'     => 'fog_security_group',
         'SourceSecurityGroupOwnerId'  => @owner_id
       }).body
     end
 
-    tests("#delete_security_group('fog_security_group')").formats(AWS::EC2::Formats::BASIC) do
-      AWS[:ec2].delete_security_group('fog_security_group').body
+    tests("#delete_security_group('fog_security_group')").formats(AWS::Compute::Formats::BASIC) do
+      AWS[:compute].delete_security_group('fog_security_group').body
     end
 
   end
   tests('failure') do
 
-    @security_group = AWS[:ec2].security_groups.create(:description => 'tests group', :name => 'fog_security_group')
+    @security_group = AWS[:compute].security_groups.create(:description => 'tests group', :name => 'fog_security_group')
 
-    tests("duplicate #create_security_group(#{@security_group.name}, #{@security_group.description})").raises(Fog::AWS::EC2::Error) do
-      AWS[:ec2].create_security_group(@security_group.name, @security_group.description)
+    tests("duplicate #create_security_group(#{@security_group.name}, #{@security_group.description})").raises(Fog::AWS::Compute::Error) do
+      AWS[:compute].create_security_group(@security_group.name, @security_group.description)
     end
 
-    tests("#authorize_security_group_ingress({'FromPort' => 80, 'GroupName' => 'not_a_group_name', 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::EC2::NotFound) do
-      AWS[:ec2].authorize_security_group_ingress({
+    tests("#authorize_security_group_ingress({'FromPort' => 80, 'GroupName' => 'not_a_group_name', 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::Compute::NotFound) do
+      AWS[:compute].authorize_security_group_ingress({
         'FromPort' => 80,
         'GroupName' => 'not_a_group_name',
         'IpProtocol' => 'tcp',
@@ -88,20 +88,20 @@ Shindo.tests('AWS::EC2 | security group requests', ['aws']) do
       })
     end
 
-    tests("#authorize_security_group_ingress({'GroupName' => 'not_a_group_name', 'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::EC2::NotFound) do
-      AWS[:ec2].authorize_security_group_ingress({
+    tests("#authorize_security_group_ingress({'GroupName' => 'not_a_group_name', 'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::Compute::NotFound) do
+      AWS[:compute].authorize_security_group_ingress({
         'GroupName'                   => 'not_a_group_name',
         'SourceSecurityGroupName'     => 'not_a_group_name',
         'SourceSecurityGroupOwnerId'  => @owner_id
       })
     end
 
-    tests("#describe_security_group('not_a_group_name)").raises(Fog::AWS::EC2::NotFound) do
-      AWS[:ec2].describe_security_groups('not_a_group_name')
+    tests("#describe_security_group('not_a_group_name)").raises(Fog::AWS::Compute::NotFound) do
+      AWS[:compute].describe_security_groups('not_a_group_name')
     end
 
-    tests("#revoke_security_group_ingress({'FromPort' => 80, 'GroupName' => 'not_a_group_name', 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::EC2::NotFound) do
-      AWS[:ec2].revoke_security_group_ingress({
+    tests("#revoke_security_group_ingress({'FromPort' => 80, 'GroupName' => 'not_a_group_name', 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::AWS::Compute::NotFound) do
+      AWS[:compute].revoke_security_group_ingress({
         'FromPort' => 80,
         'GroupName' => 'not_a_group_name',
         'IpProtocol' => 'tcp',
@@ -109,16 +109,16 @@ Shindo.tests('AWS::EC2 | security group requests', ['aws']) do
       })
     end
 
-    tests("#revoke_security_group_ingress({'GroupName' => 'not_a_group_name', 'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::EC2::NotFound) do
-      AWS[:ec2].revoke_security_group_ingress({
+    tests("#revoke_security_group_ingress({'GroupName' => 'not_a_group_name', 'SourceSecurityGroupName' => 'not_a_group_name', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").raises(Fog::AWS::Compute::NotFound) do
+      AWS[:compute].revoke_security_group_ingress({
         'GroupName'                   => 'not_a_group_name',
         'SourceSecurityGroupName'     => 'not_a_group_name',
         'SourceSecurityGroupOwnerId'  => @owner_id
       })
     end
 
-    tests("#delete_security_group('not_a_group_name')").raises(Fog::AWS::EC2::NotFound) do
-      AWS[:ec2].delete_security_group('not_a_group_name')
+    tests("#delete_security_group('not_a_group_name')").raises(Fog::AWS::Compute::NotFound) do
+      AWS[:compute].delete_security_group('not_a_group_name')
     end
 
     @security_group.destroy

data/tests/aws/requests/{ec2 → compute}/snapshot_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('AWS::EC2 | snapshot requests', ['aws']) do
+Shindo.tests('AWS::Compute | snapshot requests', ['aws']) do
 
   @snapshot_format = {
     'description' => NilClass,
@@ -16,41 +16,41 @@ Shindo.tests('AWS::EC2 | snapshot requests', ['aws']) do
     'snapshotSet' => [@snapshot_format]
   }
 
-  @volume = AWS[:ec2].volumes.create(:availability_zone => 'us-east-1a', :size => 1)
+  @volume = AWS[:compute].volumes.create(:availability_zone => 'us-east-1a', :size => 1)
 
   tests('success') do
 
     @snapshot_id = nil
 
     tests("#create_snapshot(#{@volume.identity})").formats(@snapshot_format.merge('progress' => NilClass, 'requestId' => String)) do
-      data = AWS[:ec2].create_snapshot(@volume.identity).body
+      data = AWS[:compute].create_snapshot(@volume.identity).body
       @snapshot_id = data['snapshotId']
       data
     end
 
-    AWS[:ec2].snapshots.get(@snapshot_id).wait_for { ready? }
+    AWS[:compute].snapshots.get(@snapshot_id).wait_for { ready? }
 
     tests("#describe_snapshots").formats(@snapshots_format) do
-      AWS[:ec2].describe_snapshots.body
+      AWS[:compute].describe_snapshots.body
     end
 
     tests("#describe_snapshots('#{@snapshot_id}')").formats(@snapshots_format) do
-      AWS[:ec2].describe_snapshots(@snapshot_id).body
+      AWS[:compute].describe_snapshots(@snapshot_id).body
     end
 
-    tests("#delete_snapshots(#{@snapshot_id})").formats(AWS::EC2::Formats::BASIC) do
-      AWS[:ec2].delete_snapshot(@snapshot_id).body
+    tests("#delete_snapshots(#{@snapshot_id})").formats(AWS::Compute::Formats::BASIC) do
+      AWS[:compute].delete_snapshot(@snapshot_id).body
     end
 
   end
   tests ('failure') do
 
-    tests("#describe_snapshot('snap-00000000')").raises(Fog::AWS::EC2::NotFound) do
-      AWS[:ec2].describe_snapshots('snap-00000000')
+    tests("#describe_snapshot('snap-00000000')").raises(Fog::AWS::Compute::NotFound) do
+      AWS[:compute].describe_snapshots('snap-00000000')
     end
 
-    tests("#delete_snapshot('snap-00000000')").raises(Fog::AWS::EC2::NotFound) do
-      AWS[:ec2].delete_snapshot('snap-00000000')
+    tests("#delete_snapshot('snap-00000000')").raises(Fog::AWS::Compute::NotFound) do
+      AWS[:compute].delete_snapshot('snap-00000000')
     end
 
   end

data/tests/aws/requests/{ec2 → compute}/volume_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('AWS::EC2 | volume requests', ['aws']) do
+Shindo.tests('AWS::Compute | volume requests', ['aws']) do
 
   @volume_format = {
     'availabilityZone'  => String,
@@ -32,7 +32,7 @@ Shindo.tests('AWS::EC2 | volume requests', ['aws']) do
     'requestId' => String
   }
 
-  @server = AWS[:ec2].servers.create(:image_id => GENTOO_AMI)
+  @server = AWS[:compute].servers.create(:image_id => GENTOO_AMI)
   @server.wait_for { ready? }
 
   tests('success') do
@@ -40,60 +40,60 @@ Shindo.tests('AWS::EC2 | volume requests', ['aws']) do
     @volume_id = nil
 
     tests('#create_volume').formats(@volume_format) do
-      data = AWS[:ec2].create_volume(@server.availability_zone, 1).body
+      data = AWS[:compute].create_volume(@server.availability_zone, 1).body
       @volume_id = data['volumeId']
       data
     end
 
-    AWS[:ec2].volumes.get(@volume_id).wait_for { ready? }
+    AWS[:compute].volumes.get(@volume_id).wait_for { ready? }
 
     tests('#describe_volumes').formats(@volumes_format) do
-      AWS[:ec2].describe_volumes.body
+      AWS[:compute].describe_volumes.body
     end
 
     tests("#describe_volumes(#{@volume_id})").formats(@volumes_format) do
-      AWS[:ec2].describe_volumes.body
+      AWS[:compute].describe_volumes.body
     end
 
     tests("#attach_volume(#{@server.identity}, #{@volume_id}, '/dev/sdh')").formats(@volume_attachment_format) do
-      AWS[:ec2].attach_volume(@server.identity, @volume_id, '/dev/sdh').body
+      AWS[:compute].attach_volume(@server.identity, @volume_id, '/dev/sdh').body
     end
 
-    AWS[:ec2].volumes.get(@volume_id).wait_for { state == 'in-use' }
+    AWS[:compute].volumes.get(@volume_id).wait_for { state == 'in-use' }
 
     tests("#detach_volume('#{@volume_id}')").formats(@volume_attachment_format) do
-      AWS[:ec2].detach_volume(@volume_id).body
+      AWS[:compute].detach_volume(@volume_id).body
     end
 
-    AWS[:ec2].volumes.get(@volume_id).wait_for { ready? }
+    AWS[:compute].volumes.get(@volume_id).wait_for { ready? }
 
-    tests("#delete_volume('#{@volume_id}')").formats(AWS::EC2::Formats::BASIC) do
-      AWS[:ec2].delete_volume(@volume_id).body
+    tests("#delete_volume('#{@volume_id}')").formats(AWS::Compute::Formats::BASIC) do
+      AWS[:compute].delete_volume(@volume_id).body
     end
 
   end
   tests ('failure') do
 
-    @volume = AWS[:ec2].volumes.create(:availability_zone => @server.availability_zone, :size => 1)
+    @volume = AWS[:compute].volumes.create(:availability_zone => @server.availability_zone, :size => 1)
 
-    tests("#describe_volume('vol-00000000')").raises(Fog::AWS::EC2::NotFound) do
-      AWS[:ec2].describe_volumes('vol-00000000')
+    tests("#describe_volume('vol-00000000')").raises(Fog::AWS::Compute::NotFound) do
+      AWS[:compute].describe_volumes('vol-00000000')
     end
 
-    tests("#attach_volume('i-00000000', '#{@volume.identity}', '/dev/sdh')").raises(Fog::AWS::EC2::NotFound) do
-      AWS[:ec2].attach_volume('i-00000000', @volume.identity, '/dev/sdh')
+    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')
     end
 
-    tests("#attach_volume('#{@server.identity}', 'vol-00000000', '/dev/sdh')").raises(Fog::AWS::EC2::NotFound) do
-      AWS[:ec2].attach_volume(@server.identity, 'vol-00000000', '/dev/sdh')
+    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')
     end
 
-    tests("#detach_volume('vol-00000000')").raises(Fog::AWS::EC2::NotFound) do
-      AWS[:ec2].detach_volume('vol-00000000')
+    tests("#detach_volume('vol-00000000')").raises(Fog::AWS::Compute::NotFound) do
+      AWS[:compute].detach_volume('vol-00000000')
     end
 
-    tests("#delete_volume('vol-00000000')").raises(Fog::AWS::EC2::NotFound) do
-      AWS[:ec2].delete_volume('vol-00000000')
+    tests("#delete_volume('vol-00000000')").raises(Fog::AWS::Compute::NotFound) do
+      AWS[:compute].delete_volume('vol-00000000')
     end
 
     @volume.destroy

data/tests/bluebox/helper.rb

@@ -6,21 +6,25 @@ module Bluebox
         ![:bluebox_api_key, :bluebox_customer_id].include?(k)
       end
       hash[key] = case key
-      when :blocks
-        Fog::Bluebox.new(credentials)
+      when :compute
+        Fog::Bluebox::Compute.new(credentials)
       end
     end
     @@connections[service]
   end
 
-  module Formats
+  module Compute
 
-    PRODUCT = {
-      'cost'        => Float,
-      'description' => String,
-      'id'          => String
-    }
+    module Formats
+
+      PRODUCT = {
+        'cost'        => Float,
+        'description' => String,
+        'id'          => String
+      }
+
+    end
 
   end
 
-end
+end

data/tests/bluebox/requests/{block_tests.rb → compute/block_tests.rb}

@@ -1,4 +1,4 @@
-Shindo.tests('Bluebox | block requests', ['bluebox']) do
+Shindo.tests('Bluebox::Compute | block requests', ['bluebox']) do
 
   @block_format = {
     'cpu'       => Float,
@@ -6,11 +6,10 @@ Shindo.tests('Bluebox | block requests', ['bluebox']) do
     'id'        => String,
     'ips'       => [{'address' => String}],
     'memory'    => Integer,
-    'product'   => Bluebox::Formats::PRODUCT,
+    'product'   => Bluebox::Compute::Formats::PRODUCT,
     'status'    => String,
     'storage'   => Integer,
-    'template'  => String,
-    
+    'template'  => String
   }
 
   tests('success') do
@@ -22,45 +21,45 @@ Shindo.tests('Bluebox | block requests', ['bluebox']) do
     @block_id = nil
 
     tests("create_block('#{@product_id}', '#{@template_id}', 'password' => '#{@password}')").formats(@block_format) do
-      data = Bluebox[:blocks].create_block(@product_id, @template_id, 'password' => @password).body
+      data = Bluebox[:compute].create_block(@product_id, @template_id, 'password' => @password).body
       @block_id = data['id']
       data
     end
 
-    Bluebox[:blocks].servers.get(@block_id).wait_for { ready? }
+    Bluebox[:compute].servers.get(@block_id).wait_for { ready? }
 
     tests("get_block('#{@block_id}')").formats(@block_format) do
-      Bluebox[:blocks].get_block(@block_id).body
+      Bluebox[:compute].get_block(@block_id).body
     end
 
     tests("get_blocks").formats([@block_format.reject {|key,value| ['product', 'template'].include?(key)}]) do
-      Bluebox[:blocks].get_blocks.body
+      Bluebox[:compute].get_blocks.body
     end
 
     tests("reboot_block('#{@block_id}')").formats({'status' => String, 'text' => String}) do
-      Bluebox[:blocks].reboot_block(@block_id).body
+      Bluebox[:compute].reboot_block(@block_id).body
     end
 
-    Bluebox[:blocks].servers.get(@block_id).wait_for { ready? }
+    Bluebox[:compute].servers.get(@block_id).wait_for { ready? }
 
     tests("destroy_block('#{@block_id})'").formats({'text' => String}) do
-      Bluebox[:blocks].destroy_block(@block_id).body
+      Bluebox[:compute].destroy_block(@block_id).body
     end
 
   end
 
   tests('failure') do
 
-    tests("get_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::NotFound) do
-      Bluebox[:blocks].get_block('00000000-0000-0000-0000-000000000000')
+    tests("get_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+      Bluebox[:compute].get_block('00000000-0000-0000-0000-000000000000')
     end
 
-    tests("reboot_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::NotFound) do
-      Bluebox[:blocks].reboot_block('00000000-0000-0000-0000-000000000000')
+    tests("reboot_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+      Bluebox[:compute].reboot_block('00000000-0000-0000-0000-000000000000')
     end
 
-    tests("destroy_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::NotFound) do
-      Bluebox[:blocks].destroy_block('00000000-0000-0000-0000-000000000000')
+    tests("destroy_block('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+      Bluebox[:compute].destroy_block('00000000-0000-0000-0000-000000000000')
     end
 
   end

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

@@ -0,0 +1,25 @@
+Shindo.tests('Bluebox::Compute | product requests', ['bluebox']) do
+
+  tests('success') do
+
+    @product_id   = '94fd37a7-2606-47f7-84d5-9000deda52ae' # 1 GB
+
+    tests("get_product('#{@product_id}')").formats(Bluebox::Compute::Formats::PRODUCT) do
+      Bluebox[:compute].get_product(@product_id).body
+    end
+
+    tests("get_products").formats([Bluebox::Compute::Formats::PRODUCT]) do
+      Bluebox[:compute].get_products.body
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("get_product('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+      Bluebox[:compute].get_product('00000000-0000-0000-0000-000000000000')
+    end
+
+  end
+
+end