fog 1.11.1 → 1.12.0

data/tests/openstack/requests/network/lb_vip_tests.rb

@@ -0,0 +1,71 @@
+Shindo.tests('Fog::Network[:openstack] | lb_vip requests', ['openstack']) do
+
+  @lb_vip_format = {
+    'id'                  => String,
+    'subnet_id'           => String,
+    'pool_id'             => String,
+    'protocol'            => String,
+    'protocol_port'       => Integer,
+    'name'                => String,
+    'description'         => String,
+    'address'             => String,
+    'port_id'             => String,
+    'session_persistence' => Hash,
+    'connection_limit'    => Integer,
+    'status'              => String,
+    'admin_state_up'      => Fog::Boolean,
+    'tenant_id'           => String,
+  }
+
+  tests('success') do
+    tests('#create_lb_vip').formats({'vip' => @lb_vip_format}) do
+      subnet_id = 'subnet_id'
+      pool_id = 'pool_id'
+      protocol = 'HTTP'
+      protocol_port = 80
+      attributes = {:name => 'test-vip', :description => 'Test VIP',
+                    :address => '10.0.0.1', :connection_limit => 10,
+                    :session_persistence => { "cookie_name" => "COOKIE_NAME", "type" => "APP_COOKIE" },
+                    :admin_state_up => true, :tenant_id => 'tenant_id'}
+      Fog::Network[:openstack].create_lb_vip(subnet_id, pool_id, protocol, protocol_port, attributes).body
+    end
+
+    tests('#list_lb_vips').formats({'vips' => [@lb_vip_format]}) do
+      Fog::Network[:openstack].list_lb_vips.body
+    end
+
+    tests('#get_lb_vip').formats({'vip' => @lb_vip_format}) do
+      lb_vip_id = Fog::Network[:openstack].lb_vips.all.first.id
+      Fog::Network[:openstack].get_lb_vip(lb_vip_id).body
+    end
+
+    tests('#update_lb_vip').formats({'vip' => @lb_vip_format}) do
+      lb_vip_id = Fog::Network[:openstack].lb_vips.all.first.id
+      attributes = {:pool_id => 'new_pool_id', :name => 'new-test-vip',
+                    :description => 'New Test VIP', :connection_limit => 5,
+                    :session_persistence => { "type" => "HTTP_COOKIE" },
+                    :admin_state_up => false}
+      Fog::Network[:openstack].update_lb_vip(lb_vip_id, attributes).body
+    end
+
+    tests('#delete_lb_vip').succeeds do
+      lb_vip_id = Fog::Network[:openstack].lb_vips.all.first.id
+      Fog::Network[:openstack].delete_lb_vip(lb_vip_id)
+    end
+  end
+
+  tests('failure') do
+    tests('#get_lb_vip').raises(Fog::Network::OpenStack::NotFound) do
+      Fog::Network[:openstack].get_lb_vip(0)
+    end
+
+    tests('#update_lb_vip').raises(Fog::Network::OpenStack::NotFound) do
+      Fog::Network[:openstack].update_lb_vip(0, {})
+    end
+
+    tests('#delete_lb_vip').raises(Fog::Network::OpenStack::NotFound) do
+      Fog::Network[:openstack].delete_lb_vip(0)
+    end
+  end
+
+end

data/tests/openstack/requests/storage/large_object_tests.rb

@@ -2,34 +2,98 @@ Shindo.tests('Fog::Storage[:openstack] | large object requests', ["openstack"])
 
   unless Fog.mocking?
     @directory = Fog::Storage[:openstack].directories.create(:key => 'foglargeobjecttests')
+    @directory2 = Fog::Storage[:openstack].directories.create(:key => 'foglargeobjecttests2')
   end
 
   tests('success') do
 
-    tests("#put_object('foglargeobjecttests', 'fog_large_object/1', ('x' * 6 * 1024 * 1024))").succeeds do
+    tests("#put_object('foglargeobjecttests', 'fog_large_object/1', ('x' * 4 * 1024 * 1024))").succeeds do
       pending if Fog.mocking?
-      Fog::Storage[:openstack].put_object(@directory.identity, 'fog_large_object/1', ('x' * 6 * 1024 * 1024))
+      Fog::Storage[:openstack].put_object(@directory.identity, 'fog_large_object/1', ('x' * 4 * 1024 * 1024))
     end
 
-    tests("#put_object('foglargeobjecttests', 'fog_large_object/2', ('x' * 4 * 1024 * 1024))").succeeds do
+    tests("#put_object('foglargeobjecttests', 'fog_large_object/2', ('x' * 2 * 1024 * 1024))").succeeds do
       pending if Fog.mocking?
-      Fog::Storage[:openstack].put_object(@directory.identity, 'fog_large_object/2', ('x' * 4 * 1024 * 1024))
+      Fog::Storage[:openstack].put_object(@directory.identity, 'fog_large_object/2', ('x' * 2 * 1024 * 1024))
     end
 
-    tests("#put_object_manifest('foglargeobjecttests', 'fog_large_object')").succeeds do
+    tests("#put_object('foglargeobjecttests', 'fog_large_object2/1', ('x' * 1 * 1024 * 1024))").succeeds do
       pending if Fog.mocking?
-      Fog::Storage[:openstack].put_object_manifest(@directory.identity, 'fog_large_object')
+      Fog::Storage[:openstack].put_object(@directory.identity, 'fog_large_object2/1', ('x' * 1 * 1024 * 1024))
     end
 
-    tests("#get_object('foglargeobjecttests', 'fog_large_object').body").succeeds do
-      pending if Fog.mocking?
-      Fog::Storage[:openstack].get_object(@directory.identity, 'fog_large_object').body == ('x' * 10 * 1024 * 1024)
+    tests("using default X-Object-Manifest header") do
+
+      tests("#put_object_manifest('foglargeobjecttests', 'fog_large_object')").succeeds do
+        pending if Fog.mocking?
+        Fog::Storage[:openstack].put_object_manifest(@directory.identity, 'fog_large_object')
+      end
+
+      tests("#get_object streams all segments matching the default prefix").succeeds do
+        pending if Fog.mocking?
+        Fog::Storage[:openstack].get_object(@directory.identity, 'fog_large_object').body == ('x' * 7 * 1024 * 1024)
+      end
+
+      tests("#head_object returns Etag that includes manifest object in calculation").succeeds do
+        pending if Fog.mocking?
+
+        etags = []
+        # When the manifest object name is equal to the prefix, OpenStack treats it as if it's the first segment.
+        etags << Digest::MD5.hexdigest('') # Etag for manifest object => "d41d8cd98f00b204e9800998ecf8427e"
+        etags << Digest::MD5.hexdigest('x' * 4 * 1024 * 1024) # => "44981362d3ba9b5bacaf017c2f29d355"
+        etags << Digest::MD5.hexdigest('x' * 2 * 1024 * 1024) # => "67b2f816a30e8956149b2d7beb479e51"
+        etags << Digest::MD5.hexdigest('x' * 1 * 1024 * 1024) # => "b561f87202d04959e37588ee05cf5b10"
+        expected = Digest::MD5.hexdigest(etags.join) # => "42e92048bd2c8085e7072b0b55fd76ab"
+        actual = Fog::Storage[:openstack].head_object(@directory.identity, 'fog_large_object').headers['Etag']
+        actual.gsub('"', '') == expected # actual is returned in quotes "\"42e92048bd2c8085e7072b0b55fd76abu"\"
+      end
+
+    end
+
+    tests("specifying X-Object-Manifest segment prefix") do
+
+      tests("#put_object_manifest('foglargeobjecttests', 'fog_large_object', {'X-Object-Manifest' => 'foglargeobjecttests/fog_large_object/')").succeeds do
+        pending if Fog.mocking?
+        Fog::Storage[:openstack].put_object_manifest(@directory.identity, 'fog_large_object', {'X-Object-Manifest' => "#{@directory.identity}/fog_large_object/"})
+      end
+
+      tests("#get_object streams segments only matching the specified prefix").succeeds do
+        pending if Fog.mocking?
+        Fog::Storage[:openstack].get_object(@directory.identity, 'fog_large_object').body == ('x' * 6 * 1024 * 1024)
+      end
+
+      tests("#head_object returns Etag that does not include manifest object in calculation").succeeds do
+        pending if Fog.mocking?
+
+        etags = []
+        etags << Digest::MD5.hexdigest('x' * 4 * 1024 * 1024) # => "44981362d3ba9b5bacaf017c2f29d355"
+        etags << Digest::MD5.hexdigest('x' * 2 * 1024 * 1024) # => "67b2f816a30e8956149b2d7beb479e51"
+        expected = Digest::MD5.hexdigest(etags.join) # => "0b348495a774eaa4d4c4bbf770820f84"
+        actual = Fog::Storage[:openstack].head_object(@directory.identity, 'fog_large_object').headers['Etag']
+        actual.gsub('"', '') == expected # actual is returned in quotes "\"0b348495a774eaa4d4c4bbf770820f84"\"
+      end
+
+    end
+
+    tests("storing manifest object in a different container than the segments") do
+
+      tests("#put_object_manifest('foglargeobjecttests2', 'fog_large_object', {'X-Object-Manifest' => 'foglargeobjecttests/fog_large_object/'})").succeeds do
+        pending if Fog.mocking?
+        Fog::Storage[:openstack].put_object_manifest(@directory2.identity, 'fog_large_object', {'X-Object-Manifest' => "#{@directory.identity}/fog_large_object/"})
+      end
+
+      tests("#get_object('foglargeobjecttests2', 'fog_large_object').body").succeeds do
+        pending if Fog.mocking?
+        Fog::Storage[:openstack].get_object(@directory2.identity, 'fog_large_object').body == ('x' * 6 * 1024 * 1024)
+      end
+
     end
 
     unless Fog.mocking?
-      ['fog_large_object', 'fog_large_object/1', 'fog_large_object/2'].each do |key|
+      ['fog_large_object', 'fog_large_object/1', 'fog_large_object/2', 'fog_large_object2/1'].each do |key|
         @directory.files.new(:key => key).destroy
       end
+      @directory2.files.new(:key => 'fog_large_object').destroy
     end
 
   end
@@ -42,6 +106,6 @@ Shindo.tests('Fog::Storage[:openstack] | large object requests', ["openstack"])
 
   unless Fog.mocking?
     @directory.destroy
+    @directory2.destroy
   end
-
 end

data/tests/openvz/helper.rb

@@ -0,0 +1,41 @@
+
+# Shortcut for Fog::Compute[:openvz]
+def openvz_service
+  Fog::Compute[:openvz]
+end
+
+# Create a long lived server for the tests
+def openvz_fog_test_server
+  server = openvz_service.servers.find { |s| s.ctid == '104' }
+  unless server
+    server = openvz_service.servers.create :ctid      => '104'
+    server.start
+    server.reload
+    # Wait for the server to come up
+    begin
+      server.wait_for(120) { server.reload rescue nil; server.ready? }
+    rescue Fog::Errors::TimeoutError
+      # Server bootstrap took more than 120 secs!
+    end
+  end
+  server
+end
+
+# Destroy the long lived server
+def openvz_fog_test_server_destroy
+  server = openvz_service.servers.find { |s| s.ctid == '104' }
+  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?
+      end
+    end
+    server.stop
+    openvz_fog_test_server_destroy
+  end
+end

data/tests/openvz/models/compute/server_tests.rb

@@ -0,0 +1,56 @@
+Shindo.tests("Fog::Compute[:openvz] | server model", ['openvz', 'compute']) do
+
+  server  = openvz_fog_test_server
+
+  tests('The server model should') do
+
+    tests('have the action') do
+      test('reload') { server.respond_to? 'reload' }
+      %w{
+        destroy
+        mount
+        umount
+        restart
+        stop
+        start
+        quotaon
+        quotaoff
+        quotainit
+        suspend
+        resume
+      }.each do |action|
+        test(action) { server.respond_to? action }
+      end
+    end
+    tests('have attributes') do
+      model_attribute_hash = server.attributes
+      attributes = [
+        :ctid,
+        :description
+      ]
+      tests("The server model should respond to") do
+        attributes.each do |attribute|
+          test("#{attribute}") { server.respond_to? attribute }
+        end
+      end
+    end
+    test('#stop') do
+      pending if Fog.mocking?
+      server.stop
+      server.wait_for { server.status == 'stopped' }
+      server.status == 'stopped'
+    end
+    test('#start') do
+      pending if Fog.mocking?
+      server.start
+      server.wait_for { ready? }
+      server.ready?
+    end
+
+  end
+
+  # restore server status
+  server.start
+
+end
+

data/tests/openvz/models/compute/servers_tests.rb

@@ -0,0 +1,35 @@
+Shindo.tests('Fog::Compute[:openvz] | servers collection', ['openvz']) do
+
+  openvz_service =  Fog::Compute[:openvz]
+
+  tests('The servers collection') do
+    servers = openvz_service.servers.all
+
+    server = openvz_fog_test_server
+
+    test('should NOT be empty') do
+      servers.reload
+      !servers.empty?
+    end
+
+    test('should be a kind of Fog::Compute::Openvz::Servers') do
+      servers.kind_of? Fog::Compute::Openvz::Servers
+    end
+
+    tests('should have Fog::Compute::Openvz::Servers inside') do
+      servers.each do |s|
+        test { s.kind_of? Fog::Compute::Openvz::Server }
+      end
+    end
+
+    tests('should be able to reload itself').succeeds { servers.reload }
+
+    tests('should be able to get a model') do
+      test('by instance ctid') do
+        servers.get(server.ctid).kind_of? Fog::Compute::Openvz::Server
+      end
+    end
+
+  end
+
+end

data/tests/rackspace/block_storage_tests.rb

@@ -42,14 +42,17 @@ Shindo.tests('Fog::Rackspace::BlockStorage', ['rackspace']) do
     end
   end
 
-  tests('current authentation') do
+  tests('current authentication') do
     pending if Fog.mocking?
 
     tests('variables populated').succeeds  do
-      @service = Fog::Rackspace::BlockStorage.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0'
+      @service = Fog::Rackspace::BlockStorage.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => {:ssl_verify_peer => true}
       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? }
+
+      identity_service = @service.instance_variable_get("@identity_service")
+      returns(false, "identity service was used") { identity_service.nil? }
+      returns(true, "connection_options are passed") { identity_service.instance_variable_get("@connection_options").has_key?(:ssl_verify_peer) }
       @service.list_volumes
     end
     tests('dfw region').succeeds  do

data/tests/rackspace/cdn_tests.rb

@@ -43,10 +43,13 @@ Shindo.tests('Fog::CDN::Rackspace', ['rackspace']) do
     pending if Fog.mocking?
     
     tests('variables populated').succeeds do
-      @service = Fog::CDN::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0'
+      @service = Fog::CDN::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => { :ssl_verify_peer => true }
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
       returns(false, "path populated") { @service.instance_variable_get("@uri").path.nil? }
-      returns(false, "identity service was used") { @service.instance_variable_get("@identity_service").nil? }
+      identity_service = @service.instance_variable_get("@identity_service")
+      returns(false, "identity service was used") { identity_service.nil? }
+      returns(true, "connection_options are passed") { identity_service.instance_variable_get("@connection_options").has_key?(:ssl_verify_peer) }
+
       @service.get_containers
     end
     tests('dfw region').succeeds do

data/tests/rackspace/compute_tests.rb

@@ -43,11 +43,13 @@ Shindo.tests('Rackspace | Compute', ['rackspace']) do
     pending if Fog.mocking?
 
     tests('variables populated').succeeds do
-      @service = Fog::Compute::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0'
+      @service = Fog::Compute::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => { :ssl_verify_peer => true }
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
       returns(true) { (@service.instance_variable_get("@uri").host == 'servers.api.rackspacecloud.com') != nil }
 
-      returns(false, "identity service was used") { @service.instance_variable_get("@identity_service").nil? }
+      identity_service = @service.instance_variable_get("@identity_service")
+      returns(false, "identity service was used") { identity_service.nil? }
+      returns(true, "connection_options are passed") { identity_service.instance_variable_get("@connection_options").has_key?(:ssl_verify_peer) }
       @service.list_flavors
     end
 

data/tests/rackspace/compute_v2_tests.rb

@@ -46,10 +46,12 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) 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'
+      @service = Fog::Compute::RackspaceV2.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => {:ssl_verify_peer => true}
       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? }
+      identity_service = @service.instance_variable_get("@identity_service")
+      returns(false, "identity service was used") { identity_service.nil? }
+      returns(true, "connection_options are passed") { identity_service.instance_variable_get("@connection_options").has_key?(:ssl_verify_peer) }
       @service.list_flavors
     end
     tests('dfw region').succeeds do

data/tests/rackspace/databases_tests.rb

@@ -46,10 +46,13 @@ Shindo.tests('Fog::Rackspace::Databases', ['rackspace']) do |variable|
     pending if Fog.mocking?
 
     tests('variables populated').succeeds do
-      @service = Fog::Rackspace::Databases.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0'
+      @service = Fog::Rackspace::Databases.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => { :ssl_verify_peer => true }
       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? }
+
+      identity_service = @service.instance_variable_get("@identity_service")
+      returns(false, "identity service was used") { identity_service.nil? }
+      returns(true, "connection_options are passed") { identity_service.instance_variable_get("@connection_options").has_key?(:ssl_verify_peer) }
       @service.flavors
     end
     tests('dfw region').succeeds do

data/tests/rackspace/dns_tests.rb

@@ -47,11 +47,14 @@ Shindo.tests('Fog::DNS::Rackspace', ['rackspace']) 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'
+      @service = Fog::DNS::Rackspace.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => { :ssl_verify_peer => true }
       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? }
+
+      identity_service = @service.instance_variable_get("@identity_service")
+      returns(false, "identity service was used") { identity_service.nil? }
+      returns(true, "connection_options are passed") { identity_service.instance_variable_get("@connection_options").has_key?(:ssl_verify_peer) }
       @service.list_domains
     end
     tests('custom endpoint') do

data/tests/rackspace/load_balancer_tests.rb

@@ -46,10 +46,12 @@ Shindo.tests('Fog::Rackspace::LoadBalancers', ['rackspace']) 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'
+      @service = Fog::Rackspace::LoadBalancers.new :rackspace_auth_url => 'https://identity.api.rackspacecloud.com/v2.0', :connection_options => { :ssl_verify_peer => true }
       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? }
+      identity_service = @service.instance_variable_get("@identity_service")
+      returns(false, "identity service was used") { identity_service.nil? }
+      returns(true, "connection_options are passed") { identity_service.instance_variable_get("@connection_options").has_key?(:ssl_verify_peer) }
       @service.list_load_balancers
     end
     tests('dfw region').succeeds do

data/tests/rackspace/models/load_balancers/load_balancer_tests.rb

@@ -167,8 +167,10 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer', ['rackspace']) do
     tests('create(...with algorithm...)') do
       attributes = LOAD_BALANCER_ATTRIBUTES.clone
       attributes[:algorithm] = 'LEAST_CONNECTIONS'
+      attributes[:timeout] = 60
       @lb = @service.load_balancers.create attributes
       returns('LEAST_CONNECTIONS') { @lb.algorithm }
+      returns(60) { @lb.timeout }
 
       @lb.wait_for { ready? }