fog 1.24.0 → 1.25.0

data/lib/fog/vcloud/compute.rb

@@ -179,7 +179,6 @@ module Fog
 
         def initialize(options = {})
           require 'builder'
-          require 'fog/core/parser'
 
           @connections = {}
           @connection_options = options[:connection_options] || {}

data/lib/fog/vcloud/core.rb

@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/xml'
 
 module Fog
   module Vcloud

data/lib/fog/vcloud_director/compute.rb

@@ -487,7 +487,7 @@ module Fog
 
         def check_session_matches_credentials(session_org, session_user)
           fog_credential_org = @vcloud_director_username.split('@').last
-          fog_credential_user = @vcloud_director_username.split('@')[0...-1].join
+          fog_credential_user = @vcloud_director_username.split('@')[0...-1].join('@')
 
           if session_org != fog_credential_org
             raise Fog::Errors::Error.new "FOG_CREDENTIAL specified is for vCloud organisation '#{fog_credential_org}' but " +

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.24.0'
+  VERSION = '1.25.0'
 end

data/lib/fog/vsphere/compute.rb

@@ -304,7 +304,44 @@ module Fog
               },
               :datacenters => {
                 "Solutions" => {:name => "Solutions", :status => "grey"}
-              }
+              },
+              :clusters =>
+                [{:id => "1d4d9a3f-e4e8-4c40-b7fc-263850068fa4",
+                  :name => "Solutionscluster",
+                  :num_host => "4",
+                  :num_cpu_cores => "16",
+                  :overall_status => "green",
+                  :datacenter => "Solutions",
+                  :klass => "RbVmomi::VIM::ComputeResource"
+                 },
+                 {:id => "e4195973-102b-4096-bbd6-5429ff0b35c9",
+                  :name => "Problemscluster",
+                  :num_host => "4",
+                  :num_cpu_cores => "32",
+                  :overall_status => "green",
+                  :datacenter => "Solutions",
+                  :klass => "RbVmomi::VIM::ComputeResource"
+                 },
+                 {
+                   :klass => "RbVmomi::VIM::Folder",
+                   :clusters => [{:id => "03616b8d-b707-41fd-b3b5-The first",
+                                  :name => "Problemscluster",
+                                  :num_host => "4",
+                                  :num_cpu_cores => "32",
+                                  :overall_status => "green",
+                                  :datacenter => "Solutions",
+                                  :klass => "RbVmomi::VIM::ComputeResource"
+                                 },
+                                 {:id => "03616b8d-b707-41fd-b3b5-the Second",
+                                  :name => "Lastcluster",
+                                  :num_host => "8",
+                                  :num_cpu_cores => "32",
+                                  :overall_status => "green",
+                                  :datacenter => "Solutions",
+                                  :klass => "RbVmomi::VIM::ComputeResource"}
+                   ]
+                 }
+                ]
             }
           end
         end

data/lib/fog/vsphere/requests/compute/list_clusters.rb

@@ -11,11 +11,22 @@ module Fog
         end
 
         def raw_clusters(datacenter)
-          find_raw_datacenter(datacenter).hostFolder.childEntity.grep(RbVmomi::VIM::ClusterComputeResource)
+          folder ||= find_raw_datacenter(datacenter).hostFolder
+          @raw_clusters = get_raw_clusters_from_folder(folder)
         end
 
         protected
 
+        def get_raw_clusters_from_folder(folder)
+          folder.childEntity.map do |child_entity|
+            if child_entity.is_a? RbVmomi::VIM::ComputeResource
+              child_entity
+            elsif child_entity.is_a? RbVmomi::VIM::Folder
+              get_raw_clusters_from_folder(child_entity)
+            end
+          end.flatten
+        end
+
         def cluster_attributes cluster, datacenter_name
           {
             :id             => managed_obj_id(cluster),
@@ -27,8 +38,27 @@ module Fog
           }
         end
       end
+
       class Mock
         def list_clusters(filters = { })
+          raw_clusters.map do |cluster|
+            cluster
+          end
+        end
+
+        def raw_clusters
+          folder = self.data[:clusters]
+          @raw_clusters = get_raw_clusters_from_folder(folder)
+        end
+
+        def get_raw_clusters_from_folder(folder)
+          folder.map do |child|
+            if child[:klass] == "RbVmomi::VIM::ComputeResource"
+               child
+            elsif child[:klass] == "RbVmomi::VIM::Folder"
+              get_raw_clusters_from_folder(child[:clusters])
+            end
+          end.flatten
         end
       end
     end

data/lib/fog/vsphere/requests/compute/modify_vm_interface.rb

@@ -6,7 +6,7 @@ module Fog
           raise ArgumentError, "instance id is a required parameter" unless vmid
 
           interface = get_interface_from_options(vmid, options.merge(:server_id => vmid))
-          vm_reconfig_hardware('instance_uuid' => vmid, 'hardware_spec' => {'deviceChange'=>[create_interface(interface)]})
+          vm_reconfig_hardware('instance_uuid' => vmid, 'hardware_spec' => {'deviceChange'=>[create_interface(interface, 0, :add, options)]})
         end
 
         def destroy_vm_interface(vmid, options = {})

data/lib/fog/zerigo/dns.rb

@@ -67,7 +67,6 @@ module Fog
 
       class Real
         def initialize(options={})
-          require 'fog/core/parser'
 
           @zerigo_email  = options[:zerigo_email]
           @zerigo_token  = options[:zerigo_token]

data/lib/tasks/changelog_task.rb

@@ -114,6 +114,7 @@ Watchers      | #{watchers}
            'Decklin Foster',
            'Dylan Egan',
            'Erik Michaels-Ober',
+           'Frederick Cheung',
            'geemus',
            'Henry Addison',
            'James Bence',

data/tests/aws/models/elb/model_tests.rb

@@ -221,6 +221,12 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
       returns(true) {elb.cross_zone_load_balancing?}
     end
 
+    tests('idle_connection_settings') do
+      returns(60) { elb.connection_settings_idle_timeout }
+      elb.set_connection_settings_idle_timeout(180)
+      returns(180) { elb.connection_settings_idle_timeout }
+    end
+
     tests('default health check') do
       default_health_check = {
         "HealthyThreshold"=>10,

data/tests/aws/models/elb/tagging_tests.rb

@@ -0,0 +1,15 @@
+Shindo.tests("AWS::ELB | tagging", ['aws', 'elb']) do
+  @elb5 = Fog::AWS[:elb].load_balancers.create(:id => "fog-test-elb-tagging")
+  tags1 = {'key1' => 'val1'}
+  tags2 = {'key2' => 'val2'}
+  
+  tests "add and remove tags from an ELB" do
+    returns({})                 { @elb5.tags }
+    returns(tags1)              { @elb5.add_tags tags1 }
+    returns(tags1.merge tags2)  { @elb5.add_tags tags2 }
+    returns(tags2)              { @elb5.remove_tags tags1.keys  }
+    returns(tags2)              { @elb5.tags }
+    
+    @elb5.destroy
+  end
+end

data/tests/aws/models/iam/access_keys_tests.rb

@@ -1,6 +1,5 @@
 Shindo.tests("Fog::Compute[:iam] | access_keys", ['aws','iam']) do
 
-  Fog.mock!
   iam = Fog::AWS[:iam]
 
   @username = 'fake_user'
@@ -48,6 +47,7 @@ Shindo.tests("Fog::Compute[:iam] | access_keys", ['aws','iam']) do
   end
 
   # clean up
+  @user.access_keys.map(&:destroy)
   @user.destroy
 
 end

data/tests/aws/models/iam/policies_tests.rb

@@ -1,6 +1,5 @@
 Shindo.tests("Fog::Compute[:iam] | policies", ['aws','iam']) do
 
-  Fog.mock!
   iam = Fog::AWS[:iam]
 
   @username = 'fake_user'
@@ -50,6 +49,8 @@ Shindo.tests("Fog::Compute[:iam] | policies", ['aws','iam']) do
   end
 
   # clean up
+  @user.access_keys.map(&:destroy)
+  @user.policies.map(&:destroy)
   @user.destroy
 
 

data/tests/aws/models/iam/users_tests.rb

@@ -1,6 +1,5 @@
 Shindo.tests("Fog::Compute[:iam] | users", ['aws','iam']) do
 
-  Fog.mock!
   @iam = Fog::AWS[:iam]
   @user_one_name = 'fake_user_one'
   @user_two_name = 'fake_user_two'
@@ -9,17 +8,21 @@ Shindo.tests("Fog::Compute[:iam] | users", ['aws','iam']) do
   @user_three_path = '/path/to/fake_user_three/'
   @user_four_name = 'fake_user_four'
 
+  def all_users
+    @iam.users.all.select{|user| user.id =~ /^fake_user/ }
+  end
+
   tests('#create').succeeds do
     @user_one = @iam.users.create(:id => @user_one_name)
     @user_one.id == @user_one_name
   end
 
   tests('#all','there is only one user').succeeds do
-    @iam.users.size == 1
+    all_users.size == 1
   end
 
   tests('#all','the only user should match').succeeds do
-    @iam.users.first.id == @user_one_name
+    all_users.first.id == @user_one_name
   end
 
   tests('#create','a second user').succeeds do
@@ -28,7 +31,7 @@ Shindo.tests("Fog::Compute[:iam] | users", ['aws','iam']) do
   end
 
   tests('#all','there are two users').succeeds do
-    @iam.users.size == 2
+    all_users.size == 2
   end
 
   tests('#get','an existing user').succeeds do

data/tests/aws/models/storage/url_tests.rb

@@ -2,7 +2,6 @@
 
 Shindo.tests('AWS | url', ["aws"]) do
 
-  @expires = Time.utc(2013,1,1).utc.to_i
 
   @storage = Fog::Storage.new(
     :provider => 'AWS',
@@ -13,18 +12,15 @@ Shindo.tests('AWS | url', ["aws"]) do
 
   @file = @storage.directories.new(:key => 'fognonbucket').files.new(:key => 'test.txt')
 
-  if Fog.mock?
-    signature = Fog::Storage::AWS.new.signature(nil, nil)
-  else
-    signature = 'tajHIhKHAdFYsigmzybCpaq8N0Q%3D'
-  end
-
+  now = Fog::Time.now
   if RUBY_VERSION > '1.8.7' # ruby 1.8.x doesn't provide hash ordering
     tests('#url w/ response-cache-control').returns(
-      "https://fognonbucket.s3.amazonaws.com/test.txt?response-cache-control=No-cache&AWSAccessKeyId=123&Signature=#{signature}&Expires=1356998400"
+      "https://fognonbucket.s3.amazonaws.com/test.txt?response-cache-control=No-cache&X-Amz-Expires=500&X-Amz-Date=#{now.to_iso8601_basic}&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=123/#{now.utc.strftime('%Y%m%d')}/us-east-1/s3/aws4_request&X-Amz-SignedHeaders=host&X-Amz-Signature="
     ) do
-      @file.url(@expires, :query => { 'response-cache-control' => 'No-cache' })
+
+      @file.url(Time.now + 500, :query => { 'response-cache-control' => 'No-cache' }).gsub(/(X-Amz-Signature=)[0-9a-f]+\z/,'\\1')
     end
   end
 
+
 end

data/tests/aws/requests/compute/tag_tests.rb

@@ -1,4 +1,6 @@
 Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
+  Fog::Compute::AWS::Mock.reset if Fog.mocking?
+
   @tags_format = {
     'tagSet'    => [{
       'key'          => String,

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

@@ -39,7 +39,8 @@ Shindo.tests('AWS::ELB | load_balancer_tests', ['aws', 'elb']) do
     tests("modify_load_balancer_attributes") do
       attributes = {
         'ConnectionDraining' => {'Enabled' => true, 'Timeout' => 600},
-        'CrossZoneLoadBalancing' => {'Enabled' => true}
+        'CrossZoneLoadBalancing' => {'Enabled' => true},
+        'ConnectionSettings' => {'IdleTimeout' => 180}
       }
       Fog::AWS[:elb].modify_load_balancer_attributes(@load_balancer_id, attributes).body
       response = Fog::AWS[:elb].describe_load_balancer_attributes(@load_balancer_id).
@@ -51,6 +52,9 @@ Shindo.tests('AWS::ELB | load_balancer_tests', ['aws', 'elb']) do
       tests("ConnectionDraining has a 600 second Timeout").returns(600) do
         response['ConnectionDraining']['Timeout']
       end
+      tests("ConnectionSettings has a 180 second IdleTimeout").returns(180) do
+        response['ConnectionSettings']['IdleTimeout']
+      end
       tests("CrossZoneLoadBalancing is enabled") do
         response['CrossZoneLoadBalancing']['Enabled'] == true
       end

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

@@ -68,7 +68,7 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
 
     tests("#head_bucket('#{@aws_bucket_name}')").succeeds do
       Fog::Storage[:aws].head_bucket(@aws_bucket_name)
-    end 
+    end
 
     file.destroy
 
@@ -137,10 +137,19 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
       Fog::Storage[:aws].put_request_payment(@aws_bucket_name, 'Requester')
     end
 
+    # This should show a warning, but work (second parameter is options hash for now)
     tests("#put_bucket_website('#{@aws_bucket_name}', 'index.html')").succeeds do
       Fog::Storage[:aws].put_bucket_website(@aws_bucket_name, 'index.html')
     end
 
+    tests("#put_bucket_website('#{@aws_bucket_name}', :IndexDocument => 'index.html')").succeeds do
+      Fog::Storage[:aws].put_bucket_website(@aws_bucket_name, :IndexDocument => 'index.html')
+    end
+
+    tests("#put_bucket_website('#{@aws_bucket_name}', :RedirectAllRequestsTo => 'redirect.example..com')").succeeds do
+      Fog::Storage[:aws].put_bucket_website(@aws_bucket_name, :RedirectAllRequestsTo => 'redirect.example.com')
+    end
+
     tests("#put_bucket_acl('#{@aws_bucket_name}', 'private')").succeeds do
       Fog::Storage[:aws].put_bucket_acl(@aws_bucket_name, 'private')
     end
@@ -358,6 +367,11 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
         storage_eu_endpoint.put_bucket(@aws_bucket_name)
       end
     end
+
+    tests("#put_bucket_website('fognonbucket', :RedirectAllRequestsTo => 'redirect.example.com')").raises(Excon::Errors::NotFound) do
+      Fog::Storage[:aws].put_bucket_website('fognonbucket', :RedirectAllRequestsTo => 'redirect.example.com')
+    end
+
   end
 
   # don't keep the bucket around

data/tests/aws/signaturev4_tests.rb

@@ -37,5 +37,52 @@ Shindo.tests('AWS | signaturev4', ['aws']) do
       'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=content-type;date;host, Signature=b105eb10c6d318d2294de9d49dd8b031b55e3c3fe139f2e637da70511e9e7b71'
     end
   end
+
+  tests('get with relative path') do
+    returns(@signer.sign({:query => {}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/foo/bar/../..'}, @now)) do
+      'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470'
+    end
+  end
+
+  tests('get with pointless .') do
+    returns(@signer.sign({:query => {}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/./foo'}, @now)) do
+      'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=910e4d6c9abafaf87898e1eb4c929135782ea25bb0279703146455745391e63a'
+    end
+  end
+
+  tests('get with repeated / ') do
+    returns(@signer.sign({:query => {}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '//'}, @now)) do
+      'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b27ccfbfa7df52a200ff74193ca6e32d4b48b8856fab7ebf1c595d0670a7e470'
+    end
+  end
+
+  tests('get with repeated trailing / ') do
+    returns(@signer.sign({:query => {}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '//foo//'}, @now)) do
+      'AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/20110909/us-east-1/host/aws4_request, SignedHeaders=date;host, Signature=b00392262853cfe3201e47ccf945601079e9b8a7f51ee4c3d9ee4f187aa9bf19'
+    end
+  end
+
+  tests('get signature as components') do 
+    returns(@signer.signature_parameters({:query => {'a' => 'foo', 'b' => 'foo'}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/'}, @now)) do
+      {
+        'X-Amz-Algorithm' => 'AWS4-HMAC-SHA256',
+        'X-Amz-Credential' => 'AKIDEXAMPLE/20110909/us-east-1/host/aws4_request',
+        'X-Amz-SignedHeaders' => 'date;host',
+        'X-Amz-Signature' => 'a6c6304682c74bcaebeeab2fdfb8041bbb39c6976300791a283057bccf333fb2'
+      }
+    end
+  end
+
+  tests("inject body sha") do
+    returns(@signer.signature_parameters({:query => {'a' => 'foo', 'b' => 'foo'}, :headers => {'Host' => 'host.foo.com', 'Date' => 'Mon, 09 Sep 2011 23:36:00 GMT'}, :method => :get, :path => '/'}, @now, 'STREAMING-AWS4-HMAC-SHA256-PAYLOAD')) do
+      {
+        'X-Amz-Algorithm' => 'AWS4-HMAC-SHA256',
+        'X-Amz-Credential' => 'AKIDEXAMPLE/20110909/us-east-1/host/aws4_request',
+        'X-Amz-SignedHeaders' => 'date;host',
+        'X-Amz-Signature' => '22c32bb0d0b859b94839de4e9360bca1806e73d853f5f97ae0d849f0bdf42fb0'
+      }
+    end
+  end
+
   Fog::Time.now = ::Time.now
 end

data/tests/bluebox/requests/compute/block_tests.rb

@@ -11,7 +11,8 @@ Shindo.tests('Fog::Compute[:bluebox] | block requests', ['bluebox']) do
     'product'         => {'cost' => String, 'description' => String, 'id' => String},
     'status'          => String,
     'storage'         => Integer,
-    'location_id'     => String
+    'location_id'     => String,
+    'vsh_id'          => String
   }
 
   tests('success') do

data/tests/compute/helper.rb

@@ -129,16 +129,6 @@ def compute_providers
         :name     => "fog_#{Time.now.to_i}"
       },
       :mocked => true
-    },
-    :voxel      => {
-      :server_attributes => {
-        :name => "fog.#{Time.now.to_i}",
-        :disk_size => 10,
-        :processing_cores => 1,
-        :image_id => 55, # image 55 = Ubuntu 10.04 (Lucid), 64-bit, base install
-        :facility => "LDJ1"
-      },
-      :mocked => false
     }
   }
 end

data/tests/compute/models/flavors_tests.rb

@@ -1,6 +1,6 @@
 for provider, config in compute_providers
 
-  next if [:glesys, :voxel, :ibm, :ecloud].include?(provider)
+  next if [:glesys, :ibm, :ecloud].include?(provider)
 
   Shindo.tests("Fog::Compute[:#{provider}] | flavors", [provider.to_s]) do