fog 0.8.2 → 0.9.0

data/tests/compute/requests/slicehost/backup_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Slicehost::Compute | backup requests', ['slicehost']) do
+Shindo.tests('Fog::Compute[:slicehost] | backup requests', ['slicehost']) do
 
   @backup_format = {
     'date'      => String,
@@ -11,7 +11,7 @@ Shindo.tests('Slicehost::Compute | backup requests', ['slicehost']) do
 
     tests('#get_backups').formats({ 'backups' => [@backup_format] }) do
       pending if Fog.mocking?
-      Slicehost[:compute].get_backups.body
+      Fog::Compute[:slicehost].get_backups.body
     end
 
   end

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

@@ -1,4 +1,4 @@
-Shindo.tests('Slicehost::Compute | flavor requests', ['slicehost']) do
+Shindo.tests('Fog::Compute[:slicehost] | flavor requests', ['slicehost']) do
 
   @flavor_format = {
     'id'    => Integer,
@@ -11,12 +11,12 @@ Shindo.tests('Slicehost::Compute | flavor requests', ['slicehost']) do
 
     tests('#get_flavor(1)').formats(@flavor_format) do
       pending if Fog.mocking?
-      Slicehost[:compute].get_flavor(1).body
+      Fog::Compute[:slicehost].get_flavor(1).body
     end
 
     tests('#get_flavors').formats({ 'flavors' => [@flavor_format] }) do
       pending if Fog.mocking?
-      Slicehost[:compute].get_flavors.body
+      Fog::Compute[:slicehost].get_flavors.body
     end
 
   end
@@ -25,7 +25,7 @@ Shindo.tests('Slicehost::Compute | flavor requests', ['slicehost']) do
 
     tests('#get_flavor(0)').raises(Excon::Errors::Forbidden) do
       pending if Fog.mocking?
-      Slicehost[:compute].get_flavor(0)
+      Fog::Compute[:slicehost].get_flavor(0)
     end
 
   end

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

@@ -1,4 +1,4 @@
-Shindo.tests('Slicehost::Compute | image requests', ['slicehost']) do
+Shindo.tests('Fog::Compute[:slicehost] | image requests', ['slicehost']) do
 
   @image_format = {
     'id'    => Integer,
@@ -9,12 +9,12 @@ Shindo.tests('Slicehost::Compute | image requests', ['slicehost']) do
 
     tests('#get_image(19)').formats(@image_format) do
       pending if Fog.mocking?
-      Slicehost[:compute].get_image(19).body
+      Fog::Compute[:slicehost].get_image(19).body
     end
 
     tests('#get_images').formats({ 'images' => [@image_format] }) do
       pending if Fog.mocking?
-      Slicehost[:compute].get_images.body
+      Fog::Compute[:slicehost].get_images.body
     end
 
   end
@@ -23,7 +23,7 @@ Shindo.tests('Slicehost::Compute | image requests', ['slicehost']) do
 
     tests('#get_image(0)').raises(Excon::Errors::Forbidden) do
       pending if Fog.mocking?
-      Slicehost[:compute].get_image(0)
+      Fog::Compute[:slicehost].get_image(0)
     end
 
   end

data/tests/compute/requests/slicehost/slice_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Slicehost::Compute | slice requests', ['slicehost']) do
+Shindo.tests('Fog::Compute[:slicehost] | slice requests', ['slicehost']) do
 
   @slice_format = {
     'addresses'     => [String],
@@ -18,37 +18,37 @@ Shindo.tests('Slicehost::Compute | slice requests', ['slicehost']) do
 
     tests("#create_slice(1, 19, 'fogcreateslice')").formats(@slice_format.merge('root-password' => String)) do
       pending if Fog.mocking?
-      data = Slicehost[:compute].create_slice(1, 19, 'fogcreateslice').body
+      data = Fog::Compute[:slicehost].create_slice(1, 19, 'fogcreateslice').body
       @slice_id = data['id']
       data
     end
 
     unless Fog.mocking?
-      Slicehost[:compute].servers.get(@slice_id).wait_for { ready? }
+      Fog::Compute[:slicehost].servers.get(@slice_id).wait_for { ready? }
     end
 
     tests("#get_slice(#{@slice_id})").formats(@slice_format) do
       pending if Fog.mocking?
-      Slicehost[:compute].get_slice(@slice_id).body
+      Fog::Compute[:slicehost].get_slice(@slice_id).body
     end
 
     tests("#get_slices").formats({'slices' => [@slice_format]}) do
       pending if Fog.mocking?
-      Slicehost[:compute].get_slices.body
+      Fog::Compute[:slicehost].get_slices.body
     end
 
     tests("#reboot_slice(#{@slice_id})").formats(@slice_format) do
       pending if Fog.mocking?
-      Slicehost[:compute].reboot_slice(@slice_id).body
+      Fog::Compute[:slicehost].reboot_slice(@slice_id).body
     end
 
     unless Fog.mocking?
-      Slicehost[:compute].servers.get(@slice_id).wait_for { ready? }
+      Fog::Compute[:slicehost].servers.get(@slice_id).wait_for { ready? }
     end
 
     tests("#delete_slice(#{@slice_id})").succeeds do
       pending if Fog.mocking?
-      Slicehost[:compute].delete_slice(@slice_id)
+      Fog::Compute[:slicehost].delete_slice(@slice_id)
     end
 
   end
@@ -57,17 +57,17 @@ Shindo.tests('Slicehost::Compute | slice requests', ['slicehost']) do
 
     tests('#get_slice(0)').raises(Excon::Errors::Forbidden) do
       pending if Fog.mocking?
-      Slicehost[:compute].get_slice(0)
+      Fog::Compute[:slicehost].get_slice(0)
     end
 
     tests('#reboot_slice(0)').raises(Excon::Errors::Forbidden) do
       pending if Fog.mocking?
-      Slicehost[:compute].reboot_slice(0)
+      Fog::Compute[:slicehost].reboot_slice(0)
     end
 
-    tests('#delete_slice(0)').raises(Fog::Slicehost::Compute::NotFound) do
+    tests('#delete_slice(0)').raises(Fog::Compute::Slicehost::NotFound) do
       pending if Fog.mocking?
-      Slicehost[:compute].delete_slice(0)
+      Fog::Compute[:slicehost].delete_slice(0)
     end
 
   end

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

@@ -1,4 +1,4 @@
-Shindo.tests('StormOnDemand::Compute | server requests', ['stormondemand']) do
+Shindo.tests('Fog::Compute[:stormondemand] | server requests', ['stormondemand']) do
 
   @server_format = {
       'uniq_id'     => String,
@@ -33,31 +33,31 @@ Shindo.tests('StormOnDemand::Compute | server requests', ['stormondemand']) do
 
     tests("#create_server(:backup_enabled => 0, :config_id => 114, :domain => '#{@name}', :template => 'CENTOSUNMANAGED', :ip_count => 1, :password => 'B92bxfijsdK3!')").formats(@server_format) do
       pending if Fog.mocking?
-      data = StormOnDemand[:compute].create_server(:backup_enabled => 0,  :config_id => 114, :domain => @name, :template => 'CENTOSUNMANAGED', :ip_count => 1, :password => 'B92bxfijsdK3!').body
+      data = Fog::Compute[:stormondemand].create_server(:backup_enabled => 0,  :config_id => 114, :domain => @name, :template => 'CENTOSUNMANAGED', :ip_count => 1, :password => 'B92bxfijsdK3!').body
       @uniq_id = data['uniq_id']
       data
     end
 
     tests('#list_servers').formats(@servers_format) do
       pending if Fog.mocking?
-      StormOnDemand[:compute].list_servers.body
+      Fog::Compute[:stormondemand].list_servers.body
     end
 
     unless Fog.mocking?
-      StormOnDemand[:compute].servers.get(@uniq_id).wait_for { ready? }
+      Fog::Compute[:stormondemand].servers.get(@uniq_id).wait_for { ready? }
     end
 
     tests("#delete_server(:uniq_id => #{@uniq_id})").succeeds do
       pending if Fog.mocking?
-      StormOnDemand[:compute].delete_server(:uniq_id => @uniq_id)
+      Fog::Compute[:stormondemand].delete_server(:uniq_id => @uniq_id)
     end
 
   end
 
   tests('failure') do
-    tests('#delete_server(0)').raises(Fog::StormOnDemand::Compute::Error) do
+    tests('#delete_server(0)').raises(Fog::Compute::StormOnDemand::Error) do
       pending if Fog.mocking?
-      StormOnDemand[:compute].delete_server(:uniq_id => 'XXXXXX')
+      Fog::Compute[:stormondemand].delete_server(:uniq_id => 'XXXXXX')
     end
   end
 

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

@@ -1,4 +1,4 @@
-Shindo.tests('Voxel::Compute | image requests', ['voxel']) do
+Shindo.tests('Fog::Compute[:voxel] | image requests', ['voxel']) do
 
   @images_format = {
     'images' => [{
@@ -33,19 +33,19 @@ Shindo.tests('Voxel::Compute | image requests', ['voxel']) do
   tests('success') do
     tests('#images_list').formats(@images_format) do
       pending if Fog.mocking?
-      Voxel[:compute].images_list.body
+      Fog::Compute[:voxel].images_list.body
     end
 
     tests('#images_list(1)').formats(@image_format) do
       pending if Fog.mocking?
-      Voxel[:compute].images_list(1).body
+      Fog::Compute[:voxel].images_list(1).body
     end
   end
 
   tests('failure') do
-    tests('#images_list(0)').raises(Fog::Voxel::Compute::Error) do
+    tests('#images_list(0)').raises(Fog::Compute::Voxel::Error) do
       pending if Fog.mocking?
-      Voxel[:compute].images_list(0).body
+      Fog::Compute[:voxel].images_list(0).body
     end
   end
 

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

@@ -1,4 +1,4 @@
-Shindo.tests('Voxel::Compute | server requests', ['voxel']) do
+Shindo.tests('Fog::Compute[:voxel] | server requests', ['voxel']) do
 
   @server_format = {
     'device'  => {
@@ -77,46 +77,46 @@ Shindo.tests('Voxel::Compute | server requests', ['voxel']) do
 
     tests("#voxcloud_create( :hostname => '#{@name}', :disk_size => 10, :processing_cores => 1, :image_id => 55, :facility => 'LDJ1' )").formats(@server_format) do
       pending if Fog.mocking?
-      data = Voxel[:compute].voxcloud_create( :hostname => @name, :disk_size => 10, :processing_cores => 1, :image_id => 55, :facility => "LDJ1" ).body
+      data = Fog::Compute[:voxel].voxcloud_create( :hostname => @name, :disk_size => 10, :processing_cores => 1, :image_id => 55, :facility => "LDJ1" ).body
       @server_id = data['device']['id']
       data
     end
 
     unless Fog.mocking?
-      Voxel[:compute].servers.get(@server_id).wait_for { ready? }
+      Fog::Compute[:voxel].servers.get(@server_id).wait_for { ready? }
     end
 
     tests('#devices_list').formats(@devices_format) do
       pending if Fog.mocking?
-      Voxel[:compute].devices_list.body
+      Fog::Compute[:voxel].devices_list.body
     end
 
     tests('#devices_list(@server_id)').formats(@devices_format) do
       pending if Fog.mocking?
-      Voxel[:compute].devices_list(@server_id).body
+      Fog::Compute[:voxel].devices_list(@server_id).body
     end
 
     tests("#voxcloud_delete(#{@server_id})").succeeds do
       pending if Fog.mocking?
-      Voxel[:compute].voxcloud_delete(@server_id)
+      Fog::Compute[:voxel].voxcloud_delete(@server_id)
     end
 
   end
 
   tests('failure') do
-    tests('#voxcloud_delete(0)').raises(Fog::Voxel::Compute::Error) do
+    tests('#voxcloud_delete(0)').raises(Fog::Compute::Voxel::Error) do
       pending if Fog.mocking?
-      Voxel[:compute].voxcloud_delete(0)
+      Fog::Compute[:voxel].voxcloud_delete(0)
     end
 
-    tests('#voxcloud_status(0)').raises(Fog::Voxel::Compute::Error) do
+    tests('#voxcloud_status(0)').raises(Fog::Compute::Voxel::Error) do
       pending if Fog.mocking?
-      Voxel[:compute].voxcloud_status(0)
+      Fog::Compute[:voxel].voxcloud_status(0)
     end
 
-    tests('#devices_list(0)').raises(Fog::Voxel::Compute::Error) do
+    tests('#devices_list(0)').raises(Fog::Compute::Voxel::Error) do
       pending if Fog.mocking?
-      Voxel[:compute].devices_list(0)
+      Fog::Compute[:voxel].devices_list(0)
     end
   end
 

data/tests/dns/helper.rb

@@ -1,27 +1,30 @@
 def dns_providers
   {
-    AWS       => {
+    :aws          => {
       :mocked => false
     },
-    Bluebox   => {
+    :bluebox      => {
       :mocked => false,
       :zone_attributes => {
         :ttl => 60
       }
     },
-    Linode    => {
+    :dnsimple     => {
+      :mocked => false
+    },
+    :dnsmadeeasy  => {
+      :mocked => false
+    },
+    :linode       => {
       :mocked => false,
       :zone_attributes => {
         :email => 'fog@example.com'
       }
     },
-    Slicehost => {
-      :mocked => false
-    },
-    Zerigo    => {
+    :slicehost    => {
       :mocked => false
     },
-    DNSimple  => {
+    :zerigo       => {
       :mocked => false
     }
   }

data/tests/dns/models/record_tests.rb

@@ -1,11 +1,14 @@
 for provider, config in dns_providers
 
-  Shindo.tests("#{provider}::DNS | record", [provider.to_s.downcase]) do
+  # FIXME: delay/timing breaks things :(
+  next if [:dnsmadeeasy].include?(provider)
+
+  Shindo.tests("Fog::DNS[:#{provider}] | record", [provider]) do
 
     record_attributes = {
-      :ip => '1.2.3.4',
-      :name => 'www.fogrecordtests.com',
-      :type => 'A'
+      :name   => 'www.fogrecordtests.com',
+      :type   => 'A',
+      :value  => '1.2.3.4'
     }.merge!(config[:record_attributes] || {})
 
     if !Fog.mocking? || config[:mocked]
@@ -13,7 +16,7 @@ for provider, config in dns_providers
         :domain => 'fogrecordtests.com'
       }.merge(config[:zone_attributes] || {})
 
-      @zone = provider[:dns].zones.create(zone_attributes)
+      @zone = Fog::DNS[provider].zones.create(zone_attributes)
       model_tests(@zone.records, record_attributes, config[:mocked])
 
       @zone.destroy

data/tests/dns/models/records_tests.rb

@@ -1,11 +1,14 @@
 for provider, config in dns_providers
 
-  Shindo.tests("#{provider}::DNS | records", [provider.to_s.downcase]) do
+  # FIXME: delay/timing breaks things :(
+  next if [:dnsmadeeasy].include?(provider)
+
+  Shindo.tests("Fog::DNS[:#{provider}] | records", [provider]) do
 
     record_attributes = {
-      :ip => '1.2.3.4',
-      :name => 'www.fogrecordstests.com',
-      :type => 'A'
+      :name   => 'www.fogrecordstests.com',
+      :type   => 'A',
+      :value  => '1.2.3.4'
     }.merge!(config[:record_attributes] || {})
 
     if !Fog.mocking? || config[:mocked]
@@ -13,7 +16,7 @@ for provider, config in dns_providers
         :domain => 'fogrecordstests.com'
       }.merge(config[:zone_attributes] || {})
 
-      @zone = provider[:dns].zones.create(zone_attributes)
+      @zone = Fog::DNS[provider].zones.create(zone_attributes)
 
       collection_tests(@zone.records, record_attributes, config[:mocked])
 

data/tests/dns/models/zone_tests.rb

@@ -1,12 +1,15 @@
 for provider, config in dns_providers
 
-  Shindo.tests("#{provider}::DNS | zone", [provider.to_s.downcase]) do
+  # FIXME: delay/timing breaks things :(
+  next if [:dnsmadeeasy].include?(provider)
+
+  Shindo.tests("Fog::DNS[:#{provider}] | zone", [provider]) do
 
     zone_attributes = {
       :domain => 'fogzonetests.com'
     }.merge!(config[:zone_attributes] || {})
 
-    model_tests(provider[:dns].zones, zone_attributes, config[:mocked])
+    model_tests(Fog::DNS[provider].zones, zone_attributes, config[:mocked])
 
   end
 

data/tests/dns/models/zones_tests.rb

@@ -1,12 +1,15 @@
 for provider, config in dns_providers
 
-  Shindo.tests("#{provider}::DNS | zones", [provider.to_s.downcase]) do
+  # FIXME: delay/timing breaks things :(
+  next if [:dnsmadeeasy].include?(provider)
+
+  Shindo.tests("Fog::DNS[:#{provider}] | zones", [provider]) do
 
     zone_attributes = {
       :domain => 'fogzonestests.com'
     }.merge!(config[:zone_attributes] || {})
 
-    collection_tests(provider[:dns].zones, zone_attributes, config[:mocked])
+    collection_tests(Fog::DNS[provider].zones, zone_attributes, config[:mocked])
 
   end
 

data/tests/dns/requests/aws/dns_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('AWS::DNS | DNS requests', ['aws', 'dns']) do
+Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
 
   @org_zone_count = 0
   @zone_id = ''
@@ -18,7 +18,7 @@ Shindo.tests('AWS::DNS | DNS requests', ['aws', 'dns']) do
       
       @zone_id = nil
       
-      response = AWS[:dns].list_hosted_zones()
+      response = Fog::DNS[:aws].list_hosted_zones()
       if response.status == 200
         @hosted_zones = response.body['HostedZones']
       end
@@ -38,7 +38,7 @@ Shindo.tests('AWS::DNS | DNS requests', ['aws', 'dns']) do
       pending if Fog.mocking?
 
       @org_zone_count= 0
-      response = AWS[:dns].list_hosted_zones()
+      response = Fog::DNS[:aws].list_hosted_zones()
       if response.status == 200
         @hosted_zones = response.body['HostedZones']
         @org_zone_count = @hosted_zones.count
@@ -52,7 +52,7 @@ Shindo.tests('AWS::DNS | DNS requests', ['aws', 'dns']) do
 
       result = false
       
-      response = AWS[:dns].create_hosted_zone( @test_domain)
+      response = Fog::DNS[:aws].create_hosted_zone( @test_domain)
       if response.status == 201
 
         zone= response.body['HostedZone']
@@ -81,7 +81,7 @@ Shindo.tests('AWS::DNS | DNS requests', ['aws', 'dns']) do
       pending if Fog.mocking?
 
       result = false
-      response = AWS[:dns].get_change(@change_id)
+      response = Fog::DNS[:aws].get_change(@change_id)
       if response.status == 200
         status = response.body['Status']
         if (status == 'PENDING') or (status == 'INSYNC')
@@ -97,7 +97,7 @@ Shindo.tests('AWS::DNS | DNS requests', ['aws', 'dns']) do
 
       result = false
       
-      response = AWS[:dns].get_hosted_zone( @zone_id)
+      response = Fog::DNS[:aws].get_hosted_zone( @zone_id)
       if response.status == 200
         zone = response.body['HostedZone']
         zone_id = zone['Id']
@@ -121,7 +121,7 @@ Shindo.tests('AWS::DNS | DNS requests', ['aws', 'dns']) do
 
       result = false
       
-      response = AWS[:dns].list_hosted_zones()
+      response = Fog::DNS[:aws].list_hosted_zones()
       if response.status == 200
         
         zones= response.body['HostedZones']
@@ -156,7 +156,7 @@ Shindo.tests('AWS::DNS | DNS requests', ['aws', 'dns']) do
       change_batch = []
       change_batch << resource_record_set
       options = { :comment => 'add A record to domain'}             
-      response = AWS[:dns].change_resource_record_sets( @zone_id, change_batch, options)
+      response = Fog::DNS[:aws].change_resource_record_sets( @zone_id, change_batch, options)
       if response.status == 200
         change_id = response.body['Id']
         status = response.body['Status']
@@ -180,7 +180,7 @@ Shindo.tests('AWS::DNS | DNS requests', ['aws', 'dns']) do
       change_batch = []
       change_batch << resource_record_set
       options = { :comment => 'add CNAME record to domain'}             
-      response = AWS[:dns].change_resource_record_sets( @zone_id, change_batch, options)
+      response = Fog::DNS[:aws].change_resource_record_sets( @zone_id, change_batch, options)
       if response.status == 200
         change_id = response.body['Id']
         status = response.body['Status']
@@ -204,7 +204,7 @@ Shindo.tests('AWS::DNS | DNS requests', ['aws', 'dns']) do
       change_batch = []
       change_batch << resource_record_set
       options = { :comment => 'add MX record to domain'}             
-      response = AWS[:dns].change_resource_record_sets( @zone_id, change_batch, options)
+      response = Fog::DNS[:aws].change_resource_record_sets( @zone_id, change_batch, options)
       if response.status == 200
         change_id = response.body['Id']
         status = response.body['Status']
@@ -218,7 +218,7 @@ Shindo.tests('AWS::DNS | DNS requests', ['aws', 'dns']) do
       pending if Fog.mocking?
 
       # get resource records for zone
-      response = AWS[:dns].list_resource_record_sets( @zone_id)
+      response = Fog::DNS[:aws].list_resource_record_sets( @zone_id)
       if response.status == 200
         record_sets= response.body['ResourceRecordSets']
         num_records= record_sets.count
@@ -238,7 +238,7 @@ Shindo.tests('AWS::DNS | DNS requests', ['aws', 'dns']) do
         change_batch << resource_record_set
       }
       options = { :comment => 'remove records from domain'}             
-      response = AWS[:dns].change_resource_record_sets( @zone_id, change_batch, options)
+      response = Fog::DNS[:aws].change_resource_record_sets( @zone_id, change_batch, options)
       if response.status != 200
         result = false
         break
@@ -250,7 +250,7 @@ Shindo.tests('AWS::DNS | DNS requests', ['aws', 'dns']) do
     test("delete hosted zone #{@zone_id}") {
       pending if Fog.mocking?
 
-      response = AWS[:dns].delete_hosted_zone( @zone_id)
+      response = Fog::DNS[:aws].delete_hosted_zone( @zone_id)
 
       response.status == 200
     }
@@ -261,13 +261,13 @@ Shindo.tests('AWS::DNS | DNS requests', ['aws', 'dns']) do
   tests( 'failure') do
     tests('create hosted zone using invalid domain name').raises(Excon::Errors::BadRequest) do
       pending if Fog.mocking?
-      response = AWS[:dns].create_hosted_zone('invalid-domain')
+      response = Fog::DNS[:aws].create_hosted_zone('invalid-domain')
     end
     
     tests('get hosted zone using invalid ID').raises(Excon::Errors::Forbidden) do
       pending if Fog.mocking?
       zone_id = 'dummy-id'
-      response = AWS[:dns].get_hosted_zone(zone_id)
+      response = Fog::DNS[:aws].get_hosted_zone(zone_id)
     end
   
   end