fog 1.10.0 → 1.10.1

data/tests/rackspace/compute_v2_tests.rb

@@ -0,0 +1,101 @@
+Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do
+  
+  def assert_method(url, method)
+    @service.instance_variable_set "@rackspace_auth_url", url
+    returns(method) { @service.send :authentication_method }
+  end
+
+  tests('#authentication_method') do
+    @service = Fog::Compute::RackspaceV2.new
+  
+    assert_method nil, :authenticate_v2
+
+    assert_method 'auth.api.rackspacecloud.com', :authenticate_v1 # chef's default auth endpoint
+
+    assert_method 'https://identity.api.rackspacecloud.com', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v1', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v1.1', :authenticate_v1    
+    assert_method 'https://identity.api.rackspacecloud.com/v2.0', :authenticate_v2
+    
+    assert_method 'https://lon.identity.api.rackspacecloud.com', :authenticate_v1    
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v1', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v1.1', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v2.0', :authenticate_v2
+  end
+  
+  tests('legacy authentication') do
+    pending if Fog.mocking?
+
+    tests('variables populated').succeeds do
+      @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(false, "path populated") { @service.instance_variable_get("@uri").path.nil? }
+      returns(true, "identity_service was not used") { @service.instance_variable_get("@identity_service").nil? }
+      @service.list_flavors
+    end
+    
+    tests('custom endpoint') do
+      @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0', 
+        :rackspace_compute_url => 'https://my-custom-endpoint.com'
+        returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+        returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+  end
+
+  tests('current authentation') do
+    pending if Fog.mocking?
+    
+    tests('variables populated').succeeds do
+      @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(false, "path populated") { @service.instance_variable_get("@uri").host.nil? }
+      returns(false, "identity service was used") { @service.instance_variable_get("@identity_service").nil? }
+      @service.list_flavors
+    end
+    tests('dfw region').succeeds do
+      @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_region => :dfw
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil }
+      @service.list_flavors
+    end
+    tests('ord region').succeeds do
+      @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_region => :ord
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /ord/) != nil }
+      @service.list_flavors
+    end
+    tests('custom endpoint') do
+      @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', 
+        :rackspace_compute_url => 'https://my-custom-endpoint.com'
+        returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+        returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+  end
+  
+  tests('default auth') do
+    pending if Fog.mocking?
+    
+    tests('no params').succeeds do
+      @service = Fog::Compute::RackspaceV2.new
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil }
+      @service.list_flavors
+    end
+    tests('specify old contstant style service endoint').succeeds do
+      @service = Fog::Compute::RackspaceV2.new :rackspace_endpoint => Fog::Compute::RackspaceV2::ORD_ENDPOINT
+      @service.list_flavors
+    end
+    tests('specify region').succeeds do
+      @service = Fog::Compute::RackspaceV2.new :rackspace_region => :ord
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /ord/ ) != nil }
+      @service.list_flavors
+    end    
+    tests('custom endpoint') do
+      @service = Fog::Compute::RackspaceV2.new :rackspace_compute_url => 'https://my-custom-endpoint.com'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+  end
+  
+end

data/tests/rackspace/databases_tests.rb

@@ -2,6 +2,103 @@ Shindo.tests('Fog::Rackspace::Databases', ['rackspace']) do |variable|
 
   pending if Fog.mocking?
 
+
+  def assert_method(url, method)
+    @service.instance_variable_set "@rackspace_auth_url", url
+    returns(method) { @service.send :authentication_method }
+  end
+
+  tests('#authentication_method') do
+    @service = Fog::Rackspace::Databases.new
+
+    assert_method nil, :authenticate_v2
+
+    assert_method 'https://identity.api.rackspacecloud.com', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v1', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v1.1', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v2.0', :authenticate_v2
+
+    assert_method 'https://lon.identity.api.rackspacecloud.com', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v1', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v1.1', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v2.0', :authenticate_v2
+  end
+
+  tests('authentication v1') do
+    pending if Fog.mocking?
+
+    tests('variables populated') do
+      @service = Fog::Rackspace::Databases.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(false, "path populated") { @service.instance_variable_get("@uri").nil? }
+      returns(true, "identity_service was not used") { @service.instance_variable_get("@identity_service").nil? }
+      @service.flavors
+    end
+    tests('custom endpoint') do
+      @service = Fog::Rackspace::Databases.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0',
+        :rackspace_database_url => 'https://my-custom-endpoint.com'
+        returns(false, "auth token populated") { @service.send(:auth_token).nil? }
+        returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+  end
+
+  tests('authentication v2') do
+    pending if Fog.mocking?
+
+    tests('variables populated').succeeds do
+      @service = Fog::Rackspace::Databases.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(false, "path populated") { @service.instance_variable_get("@uri").nil? }
+      returns(false, "identity service was used") { @service.instance_variable_get("@identity_service").nil? }
+      @service.flavors
+    end
+    tests('dfw region').succeeds do
+      @service = Fog::Rackspace::Databases.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_region => :dfw
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil }
+      @service.flavors
+    end
+    tests('ord region').succeeds do
+      @service = Fog::Rackspace::Databases.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_region => :ord
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /ord/) != nil }
+      @service.flavors
+    end
+    tests('custom endpoint') do
+      @service = Fog::Rackspace::Databases.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0',
+        :rackspace_database_url => 'https://my-custom-endpoint.com'
+        returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+        returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+  end
+
+  tests('default auth') do
+    pending if Fog.mocking?
+
+    tests('no params').succeeds do
+      @service = Fog::Rackspace::Databases.new
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil }
+      @service.flavors
+    end
+    tests('specify old contstant style service endoint').succeeds do
+      @service = Fog::Rackspace::Databases.new :rackspace_endpoint => Fog::Rackspace::Databases::ORD_ENDPOINT
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /ord/ ) != nil }
+      @service.flavors
+    end
+    tests('specify region').succeeds do
+      @service = Fog::Rackspace::Databases.new :rackspace_region => :ord
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /ord/ ) != nil }
+      @service.flavors
+    end
+    tests('custom endpoint') do
+      @service = Fog::Rackspace::Databases.new :rackspace_database_url => 'https://my-custom-endpoint.com'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+  end
+
   @service = Fog::Rackspace::Databases.new
 
   tests('#flavors').succeeds do
@@ -23,4 +120,5 @@ Shindo.tests('Fog::Rackspace::Databases', ['rackspace']) do |variable|
     data = @service.users
     returns(true) { data.is_a? Array }
   end
+
 end

data/tests/rackspace/dns_tests.rb

@@ -0,0 +1,82 @@
+Shindo.tests('Fog::DNS::Rackspace', ['rackspace']) do
+
+  def assert_method(url, method)
+    @service.instance_variable_set "@rackspace_auth_url", url
+    returns(method) { @service.send :authentication_method }
+  end
+
+  tests('#authentication_method') do
+    @service = Fog::DNS::Rackspace.new
+
+    assert_method nil, :authenticate_v2
+
+    assert_method 'auth.api.rackspacecloud.com', :authenticate_v1 # chef's default auth endpoint
+
+    assert_method 'https://identity.api.rackspacecloud.com', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v1', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v1.1', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v2.0', :authenticate_v2
+
+    assert_method 'https://lon.identity.api.rackspacecloud.com', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v1', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v1.1', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v2.0', :authenticate_v2
+  end
+
+  tests('legacy authentication') do
+    pending if Fog.mocking?
+
+    tests('variables populated').succeeds do
+      @service = Fog::DNS::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true, "contains tenant id") {  (@service.instance_variable_get("@uri").path =~ /\/v1\.0\/\d+$/) != nil} #dns does not error if tenant id is missing
+      returns(false, "path populated") { @service.instance_variable_get("@uri").path.nil? }
+      returns(true, "identity_service was not used") { @service.instance_variable_get("@identity_service").nil? }
+      @service.list_domains
+    end
+
+    tests('custom endpoint') do
+      @service = Fog::DNS::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0',
+        :rackspace_dns_url => 'https://my-custom-endpoint.com'
+        returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+        returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+  end
+
+  tests('current authentication') do
+    pending if Fog.mocking?
+
+    tests('variables populated').succeeds do
+      @service = Fog::DNS::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(false, "path populated") { @service.instance_variable_get("@uri").host.nil? }
+      returns(true, "contains tenant id") {  (@service.instance_variable_get("@uri").path =~ /\/v1\.0\/\d+$/) != nil} #dns does not error if tenant id is missing
+      returns(false, "identity service was used") { @service.instance_variable_get("@identity_service").nil? }
+      @service.list_domains
+    end
+    tests('custom endpoint') do
+      @service = Fog::DNS::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0',
+        :rackspace_dns_url => 'https://my-custom-endpoint.com'
+        returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+        returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+  end
+
+  tests('default auth') do
+    pending if Fog.mocking?
+
+    tests('no params').succeeds do
+      @service = Fog::DNS::Rackspace.new
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(false, "path populated") { @service.instance_variable_get("@uri").host.nil? }
+      returns(true, "contains tenant id") {  (@service.instance_variable_get("@uri").path =~ /\/v1\.0\/\d+$/) != nil} #dns does not error if tenant id is missing
+      @service.list_domains
+    end
+    tests('custom endpoint') do
+      @service = Fog::DNS::Rackspace.new :rackspace_dns_url => 'https://my-custom-endpoint.com'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+  end
+
+end

data/tests/rackspace/load_balancer_tests.rb

@@ -1,5 +1,104 @@
 Shindo.tests('Fog::Rackspace::LoadBalancers', ['rackspace']) do
 
+  def assert_method(url, method)
+    @service.instance_variable_set "@rackspace_auth_url", url
+    returns(method) { @service.send :authentication_method }
+  end
+
+  tests('#authentication_method') do
+    @service = Fog::Rackspace::LoadBalancers.new
+
+    assert_method nil, :authenticate_v2
+
+    assert_method 'auth.api.rackspacecloud.com', :authenticate_v1 # chef's default auth endpoint
+
+    assert_method 'https://identity.api.rackspacecloud.com', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v1', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v1.1', :authenticate_v1
+    assert_method 'https://identity.api.rackspacecloud.com/v2.0', :authenticate_v2
+
+    assert_method 'https://lon.identity.api.rackspacecloud.com', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v1', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v1.1', :authenticate_v1
+    assert_method 'https://lon.identity.api.rackspacecloud.com/v2.0', :authenticate_v2
+  end
+
+  tests('legacy authentication') do
+    pending if Fog.mocking?
+
+    tests('variables populated').succeeds do
+      @service = Fog::Rackspace::LoadBalancers.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(false, "path populated") { @service.instance_variable_get("@uri").path.nil? }
+      returns(true, "identity_service was not used") { @service.instance_variable_get("@identity_service").nil? }
+      @service.list_load_balancers
+    end
+
+    tests('custom endpoint') do
+      @service = Fog::Rackspace::LoadBalancers.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v1.0',
+        :rackspace_load_balancers_url => 'https://my-custom-endpoint.com'
+        returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+        returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+  end
+
+  tests('current authentation') do
+    pending if Fog.mocking?
+
+    tests('variables populated').succeeds do
+      @service = Fog::Rackspace::LoadBalancers.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(false, "path populated") { @service.instance_variable_get("@uri").host.nil? }
+      returns(false, "identity service was used") { @service.instance_variable_get("@identity_service").nil? }
+      @service.list_load_balancers
+    end
+    tests('dfw region').succeeds do
+      @service = Fog::Rackspace::LoadBalancers.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_region => :dfw
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil }
+      @service.list_load_balancers
+    end
+    tests('ord region').succeeds do
+      @service = Fog::Rackspace::LoadBalancers.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :rackspace_region => :ord
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /ord/) != nil }
+      @service.list_load_balancers
+    end
+    tests('custom endpoint') do
+      @service = Fog::Rackspace::LoadBalancers.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0',
+        :rackspace_load_balancers_url => 'https://my-custom-endpoint.com'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+  end
+
+  tests('default auth') do
+    pending if Fog.mocking?
+
+    tests('no params').succeeds do
+      @service = Fog::Rackspace::LoadBalancers.new
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil }
+      @service.list_load_balancers
+    end
+    tests('specify old contstant style service endoint').succeeds do
+      @service = Fog::Rackspace::LoadBalancers.new :rackspace_lb_endpoint => Fog::Rackspace::LoadBalancers::ORD_ENDPOINT
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /ord/ ) != nil }
+      @service.list_load_balancers
+    end
+    tests('specify region').succeeds do
+      @service = Fog::Rackspace::LoadBalancers.new :rackspace_region => :ord
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true) { (@service.instance_variable_get("@uri").host =~ /ord/ ) != nil }
+      @service.list_load_balancers
+    end
+    tests('custom endpoint') do
+      @service = Fog::Rackspace::LoadBalancers.new :rackspace_load_balancers_url => 'https://my-custom-endpoint.com'
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
+    end
+  end
+
   pending if Fog.mocking?
 
   @service = Fog::Rackspace::LoadBalancers.new

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

@@ -8,6 +8,57 @@ Shindo.tests('Fog::Compute::RackspaceV2 | image', ['rackspace']) do
     :image_id => rackspace_test_image_id(service)
   }
 
+  tests('ready?') do
+    @server = Fog::Compute::RackspaceV2::Image.new
+
+    tests('default in ready state').returns(true) do
+      @server.state = Fog::Compute::RackspaceV2::Image::ACTIVE
+      @server.ready?
+    end
+
+    tests('custom ready state').returns(true) do
+      @server.state = Fog::Compute::RackspaceV2::Image::SAVING
+      @server.ready?(Fog::Compute::RackspaceV2::Image::SAVING)
+    end
+
+    tests('default NOT in ready state').returns(false) do
+      @server.state = Fog::Compute::RackspaceV2::Image::SAVING
+      @server.ready?
+    end
+
+    tests('custom NOT ready state').returns(false) do
+      @server.state = Fog::Compute::RackspaceV2::Image::UNKNOWN
+      @server.ready?(Fog::Compute::RackspaceV2::Image::SAVING)
+    end
+
+    tests('default error state').returns(true) do
+      @server.state = Fog::Compute::RackspaceV2::Image::ERROR
+      exception_occurred = false
+      begin
+        @server.ready?
+      rescue Fog::Compute::RackspaceV2::InvalidImageStateException => e
+        exception_occurred = true
+        returns(true) {e.desired_state == Fog::Compute::RackspaceV2::Image::ACTIVE }
+        returns(true) {e.current_state == Fog::Compute::RackspaceV2::Image::ERROR }
+      end
+      exception_occurred
+    end
+
+    tests('custom error state').returns(true) do
+      @server.state = Fog::Compute::RackspaceV2::Image::UNKNOWN
+      exception_occurred = false
+      begin
+        @server.ready?(Fog::Compute::RackspaceV2::Image::SAVING, Fog::Compute::RackspaceV2::Image::UNKNOWN)
+      rescue Fog::Compute::RackspaceV2::InvalidImageStateException => e
+        exception_occurred = true
+        returns(true) {e.desired_state == Fog::Compute::RackspaceV2::Image::SAVING }
+        returns(true) {e.current_state == Fog::Compute::RackspaceV2::Image::UNKNOWN }
+      end
+      exception_occurred
+    end
+  end
+
+
   tests("success") do
     begin
       server = service.servers.create(options)