fog 1.12.1 → 1.13.0

data/tests/openstack/requests/metering/resource_tests.rb

@@ -0,0 +1,19 @@
+Shindo.tests('Fog::Metering[:openstack] | resource requests', ['openstack']) do
+
+  @resource_format = {
+    'resource_id' => String,
+    'project_id'  => String,
+    'user_id'     => String,
+    'metadata'    => Hash,
+  }
+
+  tests('success') do
+    tests('#list_resource').formats([@resource_format]) do
+      Fog::Metering[:openstack].list_resources.body
+    end
+
+    tests('#get_resource').formats(@resource_format) do
+      Fog::Metering[:openstack].get_resource('test').body
+    end
+  end
+end

data/tests/openvz/helper.rb

@@ -18,6 +18,9 @@ def openvz_fog_test_server
       # Server bootstrap took more than 120 secs!
     end
   end
+
+  openvz_fog_test_cleanup
+
   server
 end
 
@@ -27,15 +30,18 @@ def openvz_fog_test_server_destroy
   server.destroy if server
 end
 
-at_exit do
-  unless Fog.mocking?
-    server = openvz_service.servers.find { |s| s.name == '104' }
-    if server
-      server.wait_for(120) do
-        reload rescue nil; ready?
+# Prepare a callback to destroy the long lived test server
+def openvz_fog_test_cleanup
+  at_exit do
+    unless Fog.mocking?
+      server = openvz_service.servers.find { |s| s.name == '104' }
+      if server
+        server.wait_for(120) do
+          reload rescue nil; ready?
+        end
       end
+      server.stop
+      openvz_fog_test_server_destroy
     end
-    server.stop
-    openvz_fog_test_server_destroy
   end
 end

data/tests/rackspace/block_storage_tests.rb

@@ -101,4 +101,13 @@ Shindo.tests('Fog::Rackspace::BlockStorage', ['rackspace']) do
     end
   end
 
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service = Fog::Rackspace::BlockStorage.new  :rackspace_region => :ord
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad-token")
+    returns(200) { @service.list_volumes.status }
+  end
+
 end

data/tests/rackspace/compute_tests.rb

@@ -87,4 +87,13 @@ Shindo.tests('Rackspace | Compute', ['rackspace']) do
       returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /snet-/) != nil }
     end
   end
+
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service =  Fog::Compute::Rackspace.new
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad-token")
+    returns(true) { [200, 203].include?(@service.list_flavors.status) }
+  end
 end

data/tests/rackspace/compute_v2_tests.rb

@@ -100,4 +100,13 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do
     end
   end
   
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service = Fog::Compute::RackspaceV2.new
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad_token")
+    returns(true) { [200, 203].include? @service.list_flavors.status }
+  end
+
 end

data/tests/rackspace/databases_tests.rb

@@ -102,6 +102,15 @@ Shindo.tests('Fog::Rackspace::Databases', ['rackspace']) do |variable|
     end
   end
 
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service = Fog::Rackspace::Databases.new
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad_token")
+    returns(200) { @service.list_flavors.status }
+  end
+
   @service = Fog::Rackspace::Databases.new
 
   tests('#flavors').succeeds do

data/tests/rackspace/dns_tests.rb

@@ -82,4 +82,24 @@ Shindo.tests('Fog::DNS::Rackspace', ['rackspace']) do
     end
   end
 
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service =Fog::DNS::Rackspace.new
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad_token")
+    returns(200) { @service.list_domains.status }
+  end
+
+  tests('array_to_query_string') do
+    pending if Fog.mocking?
+
+    @service = Fog::DNS::Rackspace.new
+    returns("") { @service.send(:array_to_query_string, nil) }
+    returns("param1=1") { @service.send(:array_to_query_string, {:param1 => [1]}) }
+    returns("param1=1") { @service.send(:array_to_query_string, {:param1 => 1}) }
+    returns("param1=1,2") { @service.send(:array_to_query_string, {:param1 => [1,2]}) }
+    returns("param1=1&param2=2") { @service.send(:array_to_query_string, {:param1 => [1], :param2 => [2]}) }
+  end
+
 end

data/tests/rackspace/helper.rb

@@ -1,6 +1,11 @@
 module Shindo
   class Tests
-    
+
+    unless Fog.mocking?
+      Fog.timeout = 2000
+      Fog::Logger.warning "Setting default fog timeout to #{Fog.timeout} seconds"
+    end
+
     def given_a_load_balancer_service(&block)
       @service = Fog::Rackspace::LoadBalancers.new
       instance_eval(&block)
@@ -23,6 +28,12 @@ module Shindo
       end
     end
   
+   def wait_for_request(description = "waiting", &block)
+     return if Fog.mocking?
+     tests(description) do
+       Fog.wait_for &block
+     end
+   end
 
    def wait_for_server_deletion(server)
      return if Fog.mocking?

data/tests/rackspace/identity_tests.rb

@@ -0,0 +1,25 @@
+Shindo.tests('Fog::Rackspace::Identity', ['rackspace']) do
+
+  tests('current authentication') do
+    pending if Fog.mocking?
+
+    tests('variables populated').returns(200)  do
+      @service = Fog::Rackspace::Identity.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => {:ssl_verify_peer => true}
+      returns(true, "auth token populated") { !@service.auth_token.nil? }
+      returns(false, "path populated") { @service.instance_variable_get("@uri").host.nil? }
+      returns(false, "service catalog populated") { @service.service_catalog.nil? }
+
+      @service.list_tenants.status
+    end
+  end
+
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service = Fog::Rackspace::Identity.new  :rackspace_region => :ord
+    returns(true, "auth token populated") { !@service.auth_token.nil? }
+    @service.instance_variable_set("@auth_token", "bad-token")
+    returns(true) { [200, 203].include? @service.list_tenants.status }
+  end
+
+end

data/tests/rackspace/load_balancer_tests.rb

@@ -101,6 +101,16 @@ Shindo.tests('Fog::Rackspace::LoadBalancers', ['rackspace']) do
     end
   end
 
+
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    @service = Fog::Rackspace::LoadBalancers.new
+    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+    @service.instance_variable_set("@auth_token", "bad-token")
+    returns(200) { @service.list_load_balancers.status }
+  end
+
   pending if Fog.mocking?
 
   @service = Fog::Rackspace::LoadBalancers.new

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

@@ -4,7 +4,7 @@ Shindo.tests('Fog::Rackspace::BlockStorage | volume', ['rackspace']) do
   options = { :display_name => "fog_#{Time.now.to_i.to_s}", :size => 100 }
 
   model_tests(service.volumes, options, true) do
-    @instance.wait_for(timeout=1200) { ready? }
+    @instance.wait_for{ ready? }
 
     tests('double save').raises(Fog::Rackspace::BlockStorage::IdentifierTaken) do
       @instance.save
@@ -18,7 +18,7 @@ Shindo.tests('Fog::Rackspace::BlockStorage | volume', ['rackspace']) do
     tests('#snapshots').succeeds do
       begin
         snapshot = @instance.create_snapshot
-        snapshot.wait_for(timeout=1200) { ready? }
+        snapshot.wait_for { ready? }
 
         returns(true) { @instance.snapshots.first.id == snapshot.id }
       ensure

data/tests/rackspace/models/compute_v2/metadata_tests.rb

@@ -11,7 +11,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | metadata', ['rackspace']) do
       :flavor_id => rackspace_test_flavor_id(service),
       :image_id => rackspace_test_image_id(service))
       
-      @server.wait_for(timeout=1500) { ready? }
+      @server.wait_for { ready? }
       
       tests('server') do
         collection_tests(@server.metadata, {:key => 'my_key', :value => 'my_value'}) do
@@ -21,7 +21,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | metadata', ['rackspace']) do
       
       tests('image') do
         @image = @server.create_image("fog_image_#{test_time}", :metadata => {:my_key => 'my_value'})
-        @image.wait_for(timeout = 1500) { ready? }
+        @image.wait_for { ready? }
         tests("#all").succeeds do
           pending if Fog.mocking? && !mocks_implemented
           metadata = @image.metadata.all

data/tests/rackspace/models/compute_v2/server_tests.rb

@@ -66,7 +66,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
   end
 
   model_tests(service.servers, options, true) do
-    @instance.wait_for(timeout=1500) { ready? }
+    @instance.wait_for { ready? }
     
     tests('#metadata[\'fog_test\']').returns('true') do
       @instance.metadata['fog_test']
@@ -79,12 +79,12 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     tests('#update').succeeds do
       @instance.name = "fog_server_update"
       @instance.access_ipv4_address= "10.10.0.1"
-      @instance.access_ipv6_address= "0:0:0:0:0:0:0:1"
+      @instance.access_ipv6_address= "::1"
       @instance.save
       sleep 60 unless Fog.mocking?
       @instance.reload
       returns("10.10.0.1") { @instance.access_ipv4_address }
-      returns("0:0:0:0:0:0:0:1") { @instance.access_ipv6_address }
+      returns("::1") { @instance.access_ipv6_address }
       returns("fog_server_update") { @instance.name }
     end
     
@@ -93,13 +93,13 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
       returns('REBOOT') { @instance.state }
     end
 
-    @instance.wait_for(timeout=1500)  { ready? }
+    @instance.wait_for { ready? }
     tests('#reboot("HARD")').succeeds do
       @instance.reboot('HARD')
       returns('HARD_REBOOT') { @instance.state }
     end
     
-    @instance.wait_for(timeout=1500)  { ready? }
+    @instance.wait_for { ready? }
     @test_image = nil
     begin
       tests('#create_image').succeeds do
@@ -112,7 +112,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     end
 
     sleep 30 unless Fog.mocking?
-    @instance.wait_for(timeout=1500) { ready? }
+    @instance.wait_for { ready? }
     sleep 60  unless Fog.mocking?
     tests('#rebuild').succeeds do
       @instance.rebuild rackspace_test_image_id(service)
@@ -120,7 +120,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     end
 
     sleep 30  unless Fog.mocking?
-    @instance.wait_for(timeout=1500) { ready? }
+    @instance.wait_for { ready? }
     sleep 60  unless Fog.mocking?
     tests('#resize').succeeds do
       @instance.resize(3)
@@ -128,37 +128,37 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     end
 
     sleep 30  unless Fog.mocking?
-    @instance.wait_for(timeout=1500) { ready?('VERIFY_RESIZE', ['ACTIVE', 'ERROR']) }
+    @instance.wait_for { ready?('VERIFY_RESIZE', ['ACTIVE', 'ERROR']) }
     sleep 60  unless Fog.mocking?
     tests('#confirm_resize').succeeds do
       @instance.confirm_resize
     end
 
     sleep 30 unless Fog.mocking?
-    @instance.wait_for(timeout=1500) { ready? }
+    @instance.wait_for { ready? }
     sleep 60 unless Fog.mocking?
     tests('#resize').succeeds do
       @instance.resize(2)
       returns('RESIZE') { @instance.state }
     end
 
-    @instance.wait_for(timeout=1500) { ready?('VERIFY_RESIZE') }
+    @instance.wait_for { ready?('VERIFY_RESIZE') }
     sleep 60  unless Fog.mocking?
     tests('#revert_resize').succeeds do
       @instance.revert_resize
     end
 
-    @instance.wait_for(timeout=1500)  { ready? }
+    @instance.wait_for { ready? }
     tests('#rescue').succeeds do
       @instance.rescue
     end
 
-    @instance.wait_for(timeout=1500) { ready?('RESCUE') }
+    @instance.wait_for { ready?('RESCUE') }
     tests('#unrescue').succeeds do
       @instance.unrescue
     end
 
-    @instance.wait_for(timeout=1500)  { ready? }
+    @instance.wait_for  { ready? }
     tests('#change_admin_password').succeeds do
       @instance.change_admin_password('somerandompassword')
       returns('PASSWORD') { @instance.state }
@@ -168,28 +168,29 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     tests('attachments') do
       begin
         @volume = cbs_service.volumes.create(:size => 100, :display_name => "fog-#{Time.now.to_i.to_s}")
-        @volume.wait_for(timeout=1500) { ready? }
+        @volume.wait_for { ready? }
         tests('#attach_volume').succeeds do
           @instance.attach_volume(@volume)
         end
         tests('#attachments').returns(true) do
-          @instance.wait_for(timeout=1500)  do
+          @instance.wait_for do
             !attachments.empty?
           end
           @instance.attachments.any? {|a| a.volume_id == @volume.id }
         end
       ensure
-        @volume.wait_for(timeout=1500) { !attachments.empty? }
+        @volume.wait_for { !attachments.empty? }
         @instance.attachments.each {|a| a.detach }
-        @volume.wait_for(timeout=1500) { ready? && attachments.empty? }        
+        @volume.wait_for { ready? && attachments.empty? }
         @volume.destroy if @volume
       end
     end
 
-    @instance.wait_for(timeout=1500)  { ready? }
+    @instance.wait_for { ready? }
    end
 
    wait_for_server_deletion(@instance)
+   sleep 60 unless Fog.mocking?
 
    tests("delete network #{@network.label}").succeeds do
      @network.destroy if @network
@@ -197,17 +198,17 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
 
   #When after testing resize/resize_confirm we get a 409 when we try to resize_revert so I am going to split it into two blocks
   model_tests(service.servers, options, true) do
-    @instance.wait_for(timeout=1500) { ready? }
+    @instance.wait_for { ready? }
     tests('#resize').succeeds do
       @instance.resize(4)
       returns('RESIZE') { @instance.state }
     end
   
-    @instance.wait_for(timeout=1500) { ready?('VERIFY_RESIZE') }
+    @instance.wait_for { ready?('VERIFY_RESIZE') }
     sleep 60 unless Fog.mocking?
     tests('#revert_resize').succeeds do
       @instance.revert_resize
     end
-    @instance.wait_for(timeout=1500) { ready? }
+    @instance.wait_for { ready? }
   end
 end

data/tests/rackspace/models/dns/zones_tests.rb

@@ -1,22 +1,36 @@
 Shindo.tests('Fog::Rackspace::DNS | zones', ['rackspace']) do
-  pending if Fog.mocking?
 
   provider = Fog::DNS[:rackspace]
   domain_sld = uniq_id
   domain_name = domain_sld + '.com'
 
   begin
-    zone = provider.zones.create({:domain => domain_name, :email => "hostmaster@#{domain_name}"})
+    unless Fog.mocking?
+      zone = provider.zones.create({:domain => domain_name, :email => "hostmaster@#{domain_name}"})
+    end
 
     tests("zones.find(#{domain_sld}) => finds domain_name") do
-      returns(1) { provider.zones.find(domain_sld).length }
+      pending if Fog.mocking?
+      returns(true) { provider.zones.all.any? {|z| z.domain == domain_name} }
     end
 
     random_name = uniq_id
     tests("zones.find(#{random_name}) => finds nothing") do
-      returns(0) { provider.zones.find(random_name).length }
+      pending if Fog.mocking?
+      returns(false) { provider.zones.all.any? {|z| z.domain == random_name} }
     end
   ensure
-    zone.destroy
+    zone.destroy unless Fog.mocking?
+  end
+
+  tests('next_params') do
+    zones = Fog::DNS::Rackspace::Zones.new
+    returns(nil, "no body") { zones.send(:next_params, nil)}
+    returns(nil, "no links") { zones.send(:next_params, {}) }
+    returns(nil, "links are empty") { zones.send(:next_params, {'links' => []}) }
+    returns(nil, "links does not contain next hash") { zones.send(:next_params, {'links' => [ {'rel' => 'previous'} ] }) }
+    returns(nil, "contains a link without parameters") { zones.send(:next_params, {'links' => [ {'rel' => 'next', 'href' => "http://localhost/next"} ] }) }
+    returns({"offset"=>["3"], "limit"=>["3"]}, "contains a link without parameters") { zones.send(:next_params, {'links' => [ {'rel' => 'next', 'href' => "http://localhost/next?offset=3&limit=3"} ] }) }
   end
+
 end