fog 1.5.0 → 1.6.0

data/tests/aws/requests/elb/helper.rb

@@ -37,7 +37,7 @@ class AWS
       })
 
       DESCRIBE_LOAD_BALANCERS = BASIC.merge({
-        'DescribeLoadBalancersResult' => {'LoadBalancerDescriptions' => [LOAD_BALANCER]}
+        'DescribeLoadBalancersResult' => {'LoadBalancerDescriptions' => [LOAD_BALANCER], 'NextMarker' => Fog::Nullable::String}
       })
 
       POLICY_ATTRIBUTE_DESCRIPTION = {
@@ -70,7 +70,7 @@ class AWS
       }
 
       DESCRIBE_LOAD_BALANCER_POLICY_TYPES = BASIC.merge({
-        'DescribeLoadBalancerPolicyTypesResult' => { 'PolicyTypeDescriptions' => [POLICY_TYPE] }
+        'DescribeLoadBalancerPolicyTypesResult' => {'PolicyTypeDescriptions' => [POLICY_TYPE] }
       })
 
       CONFIGURE_HEALTH_CHECK = BASIC.merge({

data/tests/aws/requests/elb/listener_tests.rb

@@ -8,8 +8,8 @@ Shindo.tests('AWS::ELB | listener_tests', ['aws', 'elb']) do
 
     tests("#create_load_balancer_listeners").formats(AWS::ELB::Formats::BASIC) do
       listeners = [
-        {'Protocol' => 'TCP','InstanceProtocol' => 'TCP', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']},
-        {'Protocol' => 'HTTP', 'LoadBalancerPort' => 80, 'InstancePort' => 80}
+        {'Protocol' => 'TCP', 'InstanceProtocol' => 'TCP', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']},
+        {'Protocol' => 'HTTP', 'InstanceProtocol' => 'HTTP', 'LoadBalancerPort' => 80, 'InstancePort' => 80}
       ]
       response = Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body
       response

data/tests/aws/requests/elb/load_balancer_tests.rb

@@ -7,7 +7,7 @@ Shindo.tests('AWS::ELB | load_balancer_tests', ['aws', 'elb']) do
 
     tests("#create_load_balancer").formats(AWS::ELB::Formats::CREATE_LOAD_BALANCER) do
       zones = ['us-east-1a']
-      listeners = [{'LoadBalancerPort' => 80, 'InstancePort' => 80, 'Protocol' => 'HTTP'}]
+      listeners = [{'LoadBalancerPort' => 80, 'InstancePort' => 80, 'InstanceProtocol' => 'HTTP', 'Protocol' => 'HTTP'}]
       Fog::AWS[:elb].create_load_balancer(zones, @load_balancer_id, listeners).body
     end
 

data/tests/aws/requests/glacier/archive_tests.rb

@@ -0,0 +1,13 @@
+Shindo.tests('AWS::Glacier | glacier archive tests', ['aws']) do
+  pending if Fog.mocking?
+
+  Fog::AWS[:glacier].create_vault('Fog-Test-Vault-upload')
+
+  tests('single part upload') do
+    id = Fog::AWS[:glacier].create_archive('Fog-Test-Vault-upload', 'data body').headers['x-amz-archive-id']
+    Fog::AWS[:glacier].delete_archive('Fog-Test-Vault-upload', id)
+  end
+
+  #amazon won't let us delete the vault because it has been written to in the past day
+
+end

data/tests/aws/requests/glacier/multipart_upload_tests.rb

@@ -0,0 +1,30 @@
+Shindo.tests('AWS::Glacier | glacier archive tests', ['aws']) do
+  pending if Fog.mocking?
+
+  Fog::AWS[:glacier].create_vault('Fog-Test-Vault-upload')
+
+  tests('initiate and abort') do
+    id = Fog::AWS[:glacier].initiate_multipart_upload('Fog-Test-Vault-upload', 1024*1024).headers['x-amz-multipart-upload-id']
+    returns(true){ Fog::AWS[:glacier].list_multipart_uploads('Fog-Test-Vault-upload').body['UploadsList'].collect {|item| item['MultipartUploadId']}.include?(id)}
+    Fog::AWS[:glacier].abort_multipart_upload('Fog-Test-Vault-upload', id)
+    returns(false){ Fog::AWS[:glacier].list_multipart_uploads('Fog-Test-Vault-upload').body['UploadsList'].collect {|item| item['MultipartUploadId']}.include?(id)}
+  end
+
+
+  tests('do multipart upload') do
+    hash = Fog::AWS::Glacier::TreeHash.new
+    id = Fog::AWS[:glacier].initiate_multipart_upload('Fog-Test-Vault-upload', 1024*1024).headers['x-amz-multipart-upload-id']
+    part = 't'*1024*1024
+    hash_for_part = hash.add_part(part)
+    Fog::AWS[:glacier].upload_part('Fog-Test-Vault-upload', id, part, 0, hash_for_part)
+
+    part_2 = 'u'*1024*1024
+    hash_for_part_2 = hash.add_part(part_2)
+    Fog::AWS[:glacier].upload_part('Fog-Test-Vault-upload', id, part_2, 1024*1024, hash_for_part_2)
+
+    archive = Fog::AWS[:glacier].complete_multipart_upload('Fog-Test-Vault-upload', id, 2*1024*1024, hash.hexdigest).headers['x-amz-archive-id']
+
+    Fog::AWS[:glacier].delete_archive('Fog-Test-Vault-upload', archive)    
+  #amazon won't let us delete the vault because it has been written to in the past day
+  end
+end

data/tests/aws/requests/glacier/tree_hash_tests.rb

@@ -0,0 +1,63 @@
+Shindo.tests('AWS::Glacier | glacier tree hash calcuation', ['aws']) do
+
+  tests('tree_hash(single part < 1MB)') do
+    returns(Digest::SHA256.hexdigest('')) { Fog::AWS::Glacier::TreeHash.digest('')}
+  end
+
+  tests('tree_hash(multibyte characters)') do
+    body = ("\xC2\xA1" * 1024*1024)
+    body.force_encoding('UTF-8') if body.respond_to? :encoding
+
+    expected = Digest::SHA256.hexdigest(
+                Digest::SHA256.digest("\xC2\xA1" * 1024*512) + Digest::SHA256.digest("\xC2\xA1" * 1024*512)
+              )
+    returns(expected) { Fog::AWS::Glacier::TreeHash.digest(body)}
+  end
+
+  tests('tree_hash(power of 2 number of parts)') do
+    body = ('x' * 1024*1024) + ('y'*1024*1024) + ('z'*1024*1024) + ('t'*1024*1024)
+    expected = Digest::SHA256.hexdigest(
+                 Digest::SHA256.digest(
+                    Digest::SHA256.digest('x' * 1024*1024) + Digest::SHA256.digest('y' * 1024*1024)
+                 ) +
+                 Digest::SHA256.digest(
+                   Digest::SHA256.digest('z' * 1024*1024) + Digest::SHA256.digest('t' * 1024*1024)
+                 )
+               )
+
+    returns(expected) { Fog::AWS::Glacier::TreeHash.digest(body)}
+  end
+
+  tests('tree_hash(non power of 2 number of parts)') do
+    body = ('x' * 1024*1024) + ('y'*1024*1024) + ('z'*1024*1024)
+    expected = Digest::SHA256.hexdigest(
+                 Digest::SHA256.digest(
+                    Digest::SHA256.digest('x' * 1024*1024) + Digest::SHA256.digest('y' * 1024*1024)
+                 ) +
+                 Digest::SHA256.digest('z' * 1024*1024)
+               )
+
+    returns(expected) { Fog::AWS::Glacier::TreeHash.digest(body)}
+  end
+
+  tests('multipart') do
+    tree_hash = Fog::AWS::Glacier::TreeHash.new
+    part = ('x' * 1024*1024) + ('y'*1024*1024)
+    returns(Fog::AWS::Glacier::TreeHash.digest(part)) { tree_hash.add_part part }
+
+    tree_hash.add_part('z'* 1024*1024 + 't'*1024*1024)
+
+    expected = Digest::SHA256.hexdigest(
+                 Digest::SHA256.digest(
+                    Digest::SHA256.digest('x' * 1024*1024) + Digest::SHA256.digest('y' * 1024*1024)
+                 ) +
+                 Digest::SHA256.digest(
+                   Digest::SHA256.digest('z' * 1024*1024) + Digest::SHA256.digest('t' * 1024*1024)
+                 )
+               )
+    returns(expected) { tree_hash.hexdigest}
+
+  end
+
+
+end

data/tests/aws/requests/glacier/vault_tests.rb

@@ -0,0 +1,35 @@
+Shindo.tests('AWS::Glacier | glacier vault requests', ['aws']) do
+  pending if Fog.mocking?
+
+  topic_arn = Fog::AWS[:sns].create_topic( 'fog_test_glacier_topic').body['TopicArn']
+  Fog::AWS[:glacier].create_vault('Fog-Test-Vault')
+
+  tests('list_vaults') do
+    returns(true){Fog::AWS[:glacier].list_vaults.body['VaultList'].collect {|data| data['VaultName']}.include?('Fog-Test-Vault')}
+  end
+
+  tests('describe_vault') do
+    returns('Fog-Test-Vault'){Fog::AWS[:glacier].describe_vault('Fog-Test-Vault').body['VaultName']}
+  end
+
+  tests('set_vault_notification_configuration') do
+    Fog::AWS[:glacier].set_vault_notification_configuration 'Fog-Test-Vault', topic_arn, ['ArchiveRetrievalCompleted']
+  end
+
+  tests('get_vault_notification_configuration') do
+    returns('SNSTopic' => topic_arn, 'Events' => ['ArchiveRetrievalCompleted']){ Fog::AWS[:glacier].get_vault_notification_configuration( 'Fog-Test-Vault').body}
+  end
+
+  tests('delete_vault_notification_configuration') do
+    Fog::AWS[:glacier].delete_vault_notification_configuration( 'Fog-Test-Vault')
+    raises(Excon::Errors::NotFound){Fog::AWS[:glacier].get_vault_notification_configuration( 'Fog-Test-Vault')}
+  end
+
+  tests('delete_vault') do
+    Fog::AWS[:glacier].delete_vault( 'Fog-Test-Vault')
+    raises(Excon::Errors::NotFound){Fog::AWS[:glacier].describe_vault( 'Fog-Test-Vault')}
+  end
+
+  Fog::AWS[:sns].delete_topic topic_arn
+
+end

data/tests/aws/requests/rds/helper.rb

@@ -96,7 +96,8 @@ class AWS
         'MasterUsername' => String,
         'Port' => Integer,
         'SnapshotCreateTime' => Fog::Nullable::Time,
-        'Status' => String
+        'Status' => String,
+        'SnapshotType' => String
       }
       INSTANCE = {
         'AllocatedStorage' => Integer,
@@ -115,6 +116,7 @@ class AWS
             'Status' => String,
             'DBSecurityGroupName' => String
           }],
+        'DBSubnetGroupName' => Fog::Nullable::String,
         'Endpoint' => {
           'Address' => Fog::Nullable::String,
           'Port' => Fog::Nullable::Integer
@@ -137,11 +139,15 @@ class AWS
         },
         'PreferredBackupWindow'=> String,
         'PreferredMaintenanceWindow'=> String,
-        'ReadReplicaDBInstanceIdentifiers'=> [String],
-        'ReadReplicaDBInstanceIdentifiers'=> [Fog::Nullable::String],
-        'ReadReplicaSourceDBInstanceIdentifier'=> Fog::Nullable::String
+        'ReadReplicaDBInstanceIdentifiers'=> [Fog::Nullable::String]
       }
 
+      REPLICA_INSTANCE = INSTANCE.merge({
+        'BackupRetentionPeriod' => Fog::Nullable::String,
+        'PreferredBackupWindow' => Fog::Nullable::String,
+        'ReadReplicaSourceDBInstanceIdentifier'=> String
+      })
+
       CREATE_DB_INSTANCE = BASIC.merge({
         'CreateDBInstanceResult' => {
           'DBInstance' => INSTANCE
@@ -175,7 +181,7 @@ class AWS
 
       CREATE_READ_REPLICA = BASIC.merge({
         'CreateDBInstanceReadReplicaResult' => {
-          'DBInstance' => INSTANCE
+          'DBInstance' => REPLICA_INSTANCE
         }
       })
 

data/tests/aws/requests/rds/instance_tests.rb

@@ -70,8 +70,6 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
 
     server.reload.wait_for { state == 'available' }
 
-    pending if Fog.mocking?
-
     tests( "#create read replica").formats(AWS::RDS::Formats::CREATE_READ_REPLICA) do
       Fog::AWS[:rds].create_db_instance_read_replica(@db_replica_id, @db_instance_id).body
     end

data/tests/aws/requests/storage/acl_utils_tests.rb

@@ -1,6 +1,6 @@
 require 'fog/aws/requests/storage/acl_utils'
 
-Shindo.tests('Fog::Storage::AWS | ACL utils', [:aws]) do
+Shindo.tests('Fog::Storage::AWS | ACL utils', ["aws"]) do
   tests(".hash_to_acl") do
     tests(".hash_to_acl({}) at xpath //AccessControlPolicy").returns("", "has an empty AccessControlPolicy") do
       xml = Fog::Storage::AWS.hash_to_acl({})

data/tests/aws/requests/storage/bucket_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:aws] | bucket requests', [:aws]) do
+Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
   @aws_bucket_name = 'fogbuckettests-' + Time.now.to_i.to_s(32)
 
   tests('success') do

data/tests/aws/requests/storage/multipart_upload_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:aws] | multipart upload requests', [:aws]) do
+Shindo.tests('Fog::Storage[:aws] | multipart upload requests', ["aws"]) do
 
   @directory = Fog::Storage[:aws].directories.create(:key => 'fogmultipartuploadtests')
 

data/tests/aws/requests/storage/object_tests.rb

@@ -26,6 +26,14 @@ Shindo.tests('AWS::Storage | object requests', ['aws']) do
       data
     end
 
+    tests("#get_object('#{@directory.identity}', 'fog_object', {'Range' => 'bytes=0-20'})").returns(lorem_file.read[0..20]) do
+      Fog::Storage[:aws].get_object(@directory.identity, 'fog_object', {'Range' => 'bytes=0-20'}).body
+    end
+
+    tests("#get_object('#{@directory.identity}', 'fog_object', {'Range' => 'bytes=0-0'})").returns(lorem_file.read[0..0]) do
+      Fog::Storage[:aws].get_object(@directory.identity, 'fog_object', {'Range' => 'bytes=0-0'}).body
+    end
+
     tests("#head_object('#{@directory.identity}', 'fog_object')").succeeds do
       Fog::Storage[:aws].head_object(@directory.identity, 'fog_object')
     end

data/tests/aws/requests/storage/versioning_tests.rb

@@ -20,7 +20,7 @@ def delete_bucket
   Fog::Storage[:aws].delete_bucket(@aws_bucket_name)
 end
 
-Shindo.tests('Fog::Storage[:aws] | versioning', [:aws]) do
+Shindo.tests('Fog::Storage[:aws] | versioning', ["aws"]) do
   tests('success') do
     tests("#put_bucket_versioning") do
       @aws_bucket_name = 'fogbuckettests-' + Fog::Mock.random_hex(16)

data/tests/aws/signaturev4_tests.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+Shindo.tests('AWS | signaturev4', ['aws']) do
+
+  # These testcases are from http://docs.amazonwebservices.com/general/latest/gr/signature-v4-test-suite.html
+  @signer = Fog::AWS::SignatureV4.new('AKIDEXAMPLE', 'wJalrXUtnFEMI/K7MDENG+bPxRfiCYEXAMPLEKEY', 'us-east-1','host')
+
+  Fog::Time.now = ::Time.utc(2011,9,9,23,36,0)
+
+  tests('get-vanilla') do
+    returns(@signer.sign({:headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/'}, Fog::Time.now)) do
+      'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470'
+    end
+  end
+
+  tests('get-vanilla-query-order-key with symbol keys') do
+    returns(@signer.sign({:query => {:'a' => 'foo', :'b' => 'foo'}, :headers => {:'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/'}, Fog::Time.now)) do
+      'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=0dc122f3b28b831ab48ba65cb47300de53fbe91b577fe113edac383730254a3b'
+    end
+  end
+  
+  tests('get-vanilla-query-order-key') do
+    returns(@signer.sign({:query => {'a' => 'foo', 'b' => 'foo'}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/'}, Fog::Time.now)) do
+      'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=0dc122f3b28b831ab48ba65cb47300de53fbe91b577fe113edac383730254a3b'
+    end
+  end
+
+  tests('get-unreserved') do
+    returns(@signer.sign({:headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/-._~0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'}, Fog::Time.now)) do
+      'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=830cc36d03f0f84e6ee4953fbe701c1c8b71a0372c63af9255aa364dd183281e'
+    end
+  end
+
+  tests('post-x-www-form-urlencoded-parameter') do
+    returns(@signer.sign({:headers => {'Content-type' => 'application/x-www-form-urlencoded; charset=utf8', 'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :post, :path => '/',
+                          :body => 'foo=bar'}, Fog::Time.now)) do
+      'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=content-type;date;host, Signature=b105eb10c6d318d2294de9d49dd8b031b55e3c3fe139f2e637da70511e9e7b71'
+    end
+  end
+  Fog::Time.now = ::Time.now
+end

data/tests/brightbox/compute_tests.rb

@@ -0,0 +1,9 @@
+Shindo.tests('Fog::Compute::Brightbox::Real', ['brightbox']) do
+
+  @bb = Fog::Compute::Brightbox::Real.new({})
+
+  tests("#respond_to? :default_image").returns(true) do
+    @bb.respond_to?(:default_image)
+  end
+
+end

data/tests/brightbox/requests/compute/helper.rb

@@ -42,13 +42,20 @@ class Brightbox
     module TestSupport
       # Find a suitable image for testing with
       # For speed of server building we're using an empty image
+      #
+      # Unless the tester has credentials this will fail so we rescue
+      # any errors and return nil.
+      #
+      # This is used in the shared file +tests/compute/helper.rb+ so unfortunately
+      # makes all tests reliant on hardcoded values and each other
+      #
+      # @return [String,NilClass] the most suitable test image's identifier or nil
       def self.image_id
         return @image_id unless @image_id.nil?
-        images = Fog::Compute[:brightbox].list_images
-        raise "No available images!" if images.empty?
-        image = images.select {|img| img.size == 0 }.first
-        image = images.first if image.nil?
+        image = select_testing_image_from_api
         @image_id = image["id"]
+      rescue
+        @image_id = nil
       end
 
       # Prepare a test server, wait for it to be usable but raise if it fails
@@ -62,6 +69,13 @@ class Brightbox
         server
       end
 
+    private
+      def self.select_testing_image_from_api
+        images = Fog::Compute[:brightbox].list_images
+        raise "No available images!" if images.empty?
+        images.select {|img| img.size == 0 }.first || images.first
+      end
+
     end
     module Formats
       module Struct
@@ -189,7 +203,7 @@ class Brightbox
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
-          "name"            => String,
+          "name"            => Fog::Nullable::String,
           "created_at"      => String,
           "default"         => Fog::Boolean,
           "description"     => Fog::Nullable::String,
@@ -340,7 +354,7 @@ class Brightbox
           "id"              => String,
           "resource_type"   => String,
           "url"             => String,
-          "name"            => String,
+          "name"            => Fog::Nullable::String,
           "description"     => Fog::Nullable::String,
           "default"         => Fog::Boolean,
           "created_at"      => String,
@@ -547,6 +561,7 @@ class Brightbox
           "server_groups"   => [Brightbox::Compute::Formats::Nested::SERVER_GROUP],
           "interfaces"      => [Brightbox::Compute::Formats::Nested::INTERFACE],
           "zone"            => Fog::Brightbox::Nullable::Zone,
+          "licence_name"    => Fog::Nullable::String,
           "username"        => Fog::Nullable::String
         }
 

data/tests/cloudstack/compute/models/volume_tests.rb

@@ -19,7 +19,7 @@ def volume_tests(connection, params, mocks_implemented = true)
   end
 end
 
-Shindo.tests("Fog::Compute[:cloudstack] | volume", :cloudstack) do
+Shindo.tests("Fog::Compute[:cloudstack] | volume", "cloudstack") do
 
   config = compute_providers[:cloudstack]
 

data/tests/cloudstack/requests/volume_tests.rb

@@ -45,4 +45,4 @@ Shindo.tests('Fog::Compute[:cloudstack] | volume requests', ['cloudstack']) do
 
   end
 
-end
+end

data/tests/compute/helper.rb

@@ -15,7 +15,7 @@ def compute_providers
     },
     :brightbox  => {
       :server_attributes => {
-        :image_id => 'img-wwgbb' # Ubuntu Lucid 10.04 server (i686)
+        :image_id => Brightbox::Compute::TestSupport.image_id
       },
       :mocked => false
     },
@@ -33,12 +33,18 @@ def compute_providers
       },
       :server_attributes => {}.tap do |hash|
         [:zone_id, :network_ids, :template_id, :service_offering_id].each do |k|
-          hash[k]= Fog.credentials["cloudstack_#{k}".to_sym]
+          key = "cloudstack_#{k}".to_sym
+          if Fog.credentials[key]
+            hash[k]= Fog.credentials[key]
+          end
         end
       end,
       :volume_attributes => {:name => "somevolume"}.tap do |hash|
         [:zone_id, :disk_offering_id].each do |k|
-          hash[k]= Fog.credentials["cloudstack_#{k}".to_sym]
+          key = "cloudstack_#{k}".to_sym
+          if Fog.credentials[key]
+            hash[k]= Fog.credentials[key]
+          end
         end
       end,
       :security_group_attributes => {:name => "cloudstack.sg.#{Time.now.to_i}"},
@@ -53,7 +59,7 @@ def compute_providers
     :glesys   => {
       :server_attributes => {
         :rootpassword  => "secret_password_#{Time.now.to_i}",
-        :hostname      => "fog.example#{Time.now.to_i}.com"
+       :hostname      => "fog.example#{Time.now.to_i}.com"
       },
       :mocked => false
     },