fog 1.15.0 → 1.16.0

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

@@ -19,13 +19,13 @@ Shindo.tests('Fog::Compute[:brightbox] | image requests', ['brightbox']) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_images
       @image_id = result.first["id"]
-      formats(Brightbox::Compute::Formats::Collection::IMAGES, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::IMAGES, {:allow_extra_keys => true}) { result }
     end
 
     tests("#get_image('#{@image_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_image(@image_id)
-      formats(Brightbox::Compute::Formats::Full::IMAGE, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::IMAGE, {:allow_extra_keys => true}) { result }
     end
 
     ## Until Image creation can be automated, we shouldn't be updating Images randomly

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

@@ -19,7 +19,7 @@ Shindo.tests('Fog::Compute[:brightbox] | interface requests', ['brightbox']) do
     tests("#get_interface('#{@interface_id}')") do
       pending if Fog.mocking?
       result = @test_service.get_interface(@interface_id)
-      formats(Brightbox::Compute::Formats::Full::INTERFACE, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::INTERFACE, {:allow_extra_keys => true}) { result }
     end
 
     unless Fog.mocking?

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

@@ -26,7 +26,7 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox'])
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_load_balancer(create_options)
       @load_balancer_id = result["id"]
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, {:allow_extra_keys => true}) { result }
     end
 
     unless Fog.mocking?
@@ -36,34 +36,34 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox'])
     tests("#list_load_balancers()") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_load_balancers
-      formats(Brightbox::Compute::Formats::Collection::LOAD_BALANCERS, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::LOAD_BALANCERS, {:allow_extra_keys => true}) { result }
     end
 
     tests("#get_load_balancer('#{@load_balancer_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_load_balancer(@load_balancer_id)
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, {:allow_extra_keys => true}) { result }
     end
 
     update_options = {:name => "New name"}
     tests("#update_load_balancer('#{@load_balancer_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_load_balancer(@load_balancer_id, update_options)
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, {:allow_extra_keys => true}) { result }
     end
 
     add_listeners_options = {:listeners=>[{:out=>28080, :in=>8080, :protocol=>"http"}]}
     tests("#add_listeners_load_balancer('#{@load_balancer_id}', #{add_listeners_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].add_listeners_load_balancer(@load_balancer_id, add_listeners_options)
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, {:allow_extra_keys => true}) { result }
     end
 
     remove_listeners_options = {:listeners=>[{:out=>28080, :in=>8080, :protocol=>"http"}]}
     tests("#remove_listeners_load_balancer('#{@load_balancer_id}', #{remove_listeners_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].remove_listeners_load_balancer(@load_balancer_id, remove_listeners_options)
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, {:allow_extra_keys => true}) { result }
     end
 
     unless Fog.mocking?
@@ -76,7 +76,7 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox'])
     tests("#add_nodes_load_balancer('#{@load_balancer_id}', #{add_nodes_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].add_nodes_load_balancer(@load_balancer_id, add_nodes_options)
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, {:allow_extra_keys => true}) { result }
     end
 
     # ...before we can attempt to remove either
@@ -84,13 +84,13 @@ Shindo.tests('Fog::Compute[:brightbox] | load balancer requests', ['brightbox'])
     tests("#remove_nodes_load_balancer('#{@load_balancer_id}', #{remove_nodes_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].remove_nodes_load_balancer(@load_balancer_id, remove_nodes_options)
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, {:allow_extra_keys => true}) { result }
     end
 
     tests("#destroy_load_balancer('#{@load_balancer_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].destroy_load_balancer(@load_balancer_id)
-      formats(Brightbox::Compute::Formats::Full::LOAD_BALANCER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::LOAD_BALANCER, {:allow_extra_keys => true}) { result }
     end
 
     unless Fog.mocking?

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

@@ -18,55 +18,55 @@ Shindo.tests('Fog::Compute[:brightbox] | server group requests', ['brightbox'])
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_server_group(create_options)
       @server_group_id = result["id"]
-      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, {:allow_extra_keys => true}) { result }
     end
 
     tests("#list_server_groups") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_server_groups
-      formats(Brightbox::Compute::Formats::Collection::SERVER_GROUPS, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::SERVER_GROUPS, {:allow_extra_keys => true}) { result }
       @default_group_id = result.select {|grp| grp["default"] == true }.first["id"]
     end
 
     tests("#get_server_group('#{@server_group_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_server_group(@server_group_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, {:allow_extra_keys => true}) { result }
     end
 
     update_options = {:name => "Fog@#{Time.now.iso8601}"}
     tests("#update_server_group('#{@server_group_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_server_group(@server_group_id, update_options)
-      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, {:allow_extra_keys => true}) { result }
     end
 
     remove_options = {:servers => [{:server => server_id}]}
     tests("#remove_servers_server_group('#{@server_group_id}', #{remove_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].remove_servers_server_group(@server_group_id, remove_options)
-      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, {:allow_extra_keys => true}) { result }
     end
 
     add_options = {:servers => [{:server => server_id}]}
     tests("#add_servers_server_group('#{@server_group_id}', #{remove_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].add_servers_server_group(@server_group_id, add_options)
-      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, {:allow_extra_keys => true}) { result }
     end
 
     move_options = {:destination => @default_group_id, :servers => [{:server => server_id}]}
     tests("#move_servers_server_group('#{@server_group_id}', #{move_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].move_servers_server_group(@server_group_id, move_options)
-      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, {:allow_extra_keys => true}) { result }
       test("group is emptied") { result["servers"].empty? }
     end
 
     tests("#destroy_server_group('#{@server_group_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].destroy_server_group(@server_group_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER_GROUP, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_GROUP, {:allow_extra_keys => true}) { result }
     end
 
     unless Fog.mocking?

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

@@ -11,7 +11,7 @@ Shindo.tests('Fog::Compute[:brightbox] | server requests', ['brightbox']) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].create_server(:image => image_id)
       server_id = result["id"]
-      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, {:allow_extra_keys => true}) { result }
     end
 
     unless Fog.mocking?
@@ -21,49 +21,52 @@ Shindo.tests('Fog::Compute[:brightbox] | server requests', ['brightbox']) do
     tests("#list_servers") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_servers
-      formats(Brightbox::Compute::Formats::Collection::SERVERS, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::SERVERS, {:allow_extra_keys => true}) { result }
     end
 
     tests("#get_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_server(server_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, {:allow_extra_keys => true}) { result }
     end
 
     tests("#update_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_server(server_id, :name => "Fog@#{Time.now.iso8601}")
-      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, {:allow_extra_keys => true}) { result }
     end
 
     tests("#activate_console_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].activate_console_server(server_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, {:allow_extra_keys => true}) { result }
+      test("has set 'console_url'") { ! result["console_url"].empty? }
+      test("has set 'console_token'") { ! result["console_token"].empty? }
+      test("has set 'console_token_expires'") { ! result["console_token_expires"].empty? }
     end
 
     tests("#stop_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].stop_server(server_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, {:allow_extra_keys => true}) { result }
     end
 
     tests("#start_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].start_server(server_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, {:allow_extra_keys => true}) { result }
     end
 
     tests("#shutdown_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].shutdown_server(server_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, {:allow_extra_keys => true}) { result }
     end
 
     tests("#snapshot_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].snapshot_server(server_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, {:allow_extra_keys => true}) { result }
       # Server should be exclusively for our test so assume we can delete the snapshot
       snapshot_id = result["snapshots"].first["id"]
       @snapshot = Fog::Compute[:brightbox].images.get(snapshot_id)
@@ -74,7 +77,7 @@ Shindo.tests('Fog::Compute[:brightbox] | server requests', ['brightbox']) do
     tests("#destroy_server('#{server_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].destroy_server(server_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER, {:allow_extra_keys => true}) { result }
     end
 
   end

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

@@ -6,13 +6,13 @@ Shindo.tests('Fog::Compute[:brightbox] | server type requests', ['brightbox']) d
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_server_types
       @server_type_id = result.first["id"]
-      formats(Brightbox::Compute::Formats::Collection::SERVER_TYPES, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::SERVER_TYPES, {:allow_extra_keys => true}) { result }
     end
 
     tests("#get_server_type('#{@server_type_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_server_type(@server_type_id)
-      formats(Brightbox::Compute::Formats::Full::SERVER_TYPE, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::SERVER_TYPE, {:allow_extra_keys => true}) { result }
     end
 
   end

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

@@ -6,20 +6,20 @@ Shindo.tests('Fog::Compute[:brightbox] | user requests', ['brightbox']) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_users
       @user_id = result.first["id"]
-      formats(Brightbox::Compute::Formats::Collection::USERS, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::USERS, {:allow_extra_keys => true}) { result }
     end
 
     tests("#get_user('#{@user_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_user(@user_id)
-      formats(Brightbox::Compute::Formats::Full::USER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::USER, {:allow_extra_keys => true}) { result }
     end
 
     update_options = { :name => "Example User" }
     tests("#update_user('#{@user_id}', #{update_options.inspect})") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].update_user(@user_id, update_options)
-      formats(Brightbox::Compute::Formats::Full::USER, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::USER, {:allow_extra_keys => true}) { result }
     end
 
   end

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

@@ -6,13 +6,13 @@ Shindo.tests('Fog::Compute[:brightbox] | zone requests', ['brightbox']) do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].list_zones
       @zone_id = result.first["id"]
-      formats(Brightbox::Compute::Formats::Collection::ZONES, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Collection::ZONES, {:allow_extra_keys => true}) { result }
     end
 
     tests("#get_zone('#{@zone_id}')") do
       pending if Fog.mocking?
       result = Fog::Compute[:brightbox].get_zone(@zone_id)
-      formats(Brightbox::Compute::Formats::Full::ZONE, false) { result }
+      data_matches_schema(Brightbox::Compute::Formats::Full::ZONE, {:allow_extra_keys => true}) { result }
     end
 
   end

data/tests/compute/helper.rb

@@ -120,9 +120,10 @@ def compute_providers
       }
     },
     :rackspace  => {
-      :provider_attributes => { :version => :v1 }, 
+      :provider_attributes => { :version => :v2 },
       :server_attributes => {
-        :image_id => 49, # image 49 = Ubuntu 10.04 LTS (lucid)
+        :image_id => "23b564c9-c3e6-49f9-bc68-86c7a9ab5018", # Ubuntu 12.04 LTS (Precise Pangolin)
+        :flavor_id => 2,
         :name     => "fog_#{Time.now.to_i}"
       },
       :mocked => true

data/tests/core/uuid_tests.rb

@@ -0,0 +1,10 @@
+Shindo.tests('Fog::UUID', 'core') do
+
+  tests('supported?').succeeds do
+    Fog::UUID.supported? == SecureRandom.respond_to?(:uuid)
+  end
+
+  tests('success').succeeds do
+    Fog::UUID.uuid =~ /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
+  end
+end

data/tests/dynect/requests/dns/dns_tests.rb

@@ -79,6 +79,27 @@ Shindo.tests('Dynect::dns | DNS requests', ['dynect', 'dns']) do
       @dns.post_record('A', @domain, @fqdn, {'address' => '1.2.3.4'}).body
     end
 
+    put_record_format = shared_format.merge({
+      'data' => {
+        'fqdn'        => String,
+        'ARecords'    => [
+          {
+            'rdata'      => {
+              'address'   => String
+            }
+          }
+        ],
+        'record_id'   => Integer,
+        'record_type' => String,
+        'ttl'         => Integer,
+        'zone'        => String
+      }
+    })
+
+    tests("put_record('A', '#{@domain}', '#{@fqdn}', 'address' => '1.2.3.4')").formats(post_record_format) do
+      @dns.put_record('A', @domain, @fqdn, {'address' => '1.2.3.4'}).body
+    end
+
     publish_zone_format = shared_format.merge({
       'data' => {
         'serial'        => Integer,
@@ -116,6 +137,14 @@ Shindo.tests('Dynect::dns | DNS requests', ['dynect', 'dns']) do
       @dns.get_node_list(@domain).body
     end
 
+    get_all_records_format = shared_format.merge({
+      'data' => [String]
+    })
+
+    tests("get_all_records('#{@domain}')").formats(get_all_records_format) do
+      @dns.get_all_records(@domain).body
+    end
+
     get_records_format = shared_format.merge({
       'data' => [String]
     })

data/tests/helpers/mock_helper.rb

@@ -51,6 +51,7 @@ if Fog.mock?
     :hp_secret_key                    => 'hp_secret_key',
     :hp_tenant_id                     => 'hp_tenant_id',
     :hp_avl_zone                      => 'hp_avl_zone',
+    :os_account_meta_temp_url_key     => 'os_account_meta_temp_url_key',
     :ibm_username                     => 'ibm_username',
     :ibm_password                     => 'ibm_password',
     :joyent_username                  => "joyentuser",
@@ -82,6 +83,9 @@ if Fog.mock?
     :vcloud_host                      => 'vcloud_host',
     :vcloud_password                  => 'vcloud_password',
     :vcloud_username                  => 'vcloud_username',
+    :vcloud_director_host             => 'vcloud_director_host',
+    :vcloud_director_password         => 'vcloud_director_password',
+    :vcloud_director_username         => 'vcd_user@vcd_org_name',
     :voxel_api_key                    => 'voxel_api_key',
     :voxel_api_secret                 => 'voxel_api_secret',
     :zerigo_email                     => 'zerigo_email',

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

@@ -46,6 +46,24 @@ Shindo.tests("Fog::Storage[:hp] | object requests", ['hp', 'storage']) do
     tests("#delete_object('#{@dir_name}', 'fog_object')").succeeds do
       Fog::Storage[:hp].delete_object(@dir_name, 'fog_object')
     end
+    
+    tests("#get_object_http_url('#{@directory.identity}', 'fog_object', expiration timestamp)").returns(true) do
+      object_url = Fog::Storage[:hp].get_object_http_url(@dir_name, 'fog_object', (Time.now + 60))
+      object_url.include? "fog_object"
+      object_url.include? "&temp_url_expires="
+      object_url.include? "temp_url_sig="
+      object_url.include? @dir_name
+      object_url.start_with? "http://"
+    end
+
+    tests("#get_object_https_url('#{@directory.identity}', 'fog_object', expiration timestamp)").returns(true) do
+      object_url = Fog::Storage[:hp].get_object_https_url(@dir_name, 'fog_object', (Time.now + 60))
+      object_url.include? "fog_object"
+      object_url.include? "&temp_url_expires="
+      object_url.include? "temp_url_sig="
+      object_url.include? @dir_name
+      object_url.start_with? "https://"
+    end
   end
 
   tests('failure') do
@@ -83,7 +101,7 @@ Shindo.tests("Fog::Storage[:hp] | object requests", ['hp', 'storage']) do
     end
 
   end
-
+  
   @directory.destroy
 
 end

data/tests/openstack/models/storage/file_tests.rb

@@ -2,6 +2,10 @@ Shindo.tests('Fog::OpenStack::Storage | file', ['openstack']) do
 
   pending if Fog.mocking?
 
+  def object_attributes(file=@instance)
+    @instance.service.head_object(@directory.key, file.key).headers
+  end
+
   def object_meta_attributes
     @instance.service.head_object(@directory.key, @instance.key).headers.reject {|k, v| !(k =~ /X-Object-Meta-/)}
   end
@@ -67,7 +71,22 @@ Shindo.tests('Fog::OpenStack::Storage | file', ['openstack']) do
         end
 
       end
-    
+
+      tests('#content_disposition') do
+        before do
+          @instance = @directory.files.create :key => 'meta-test', :body => lorem_file, :content_disposition => 'ho-ho-ho'
+        end
+
+        after do
+          clear_metadata
+          @instance.save
+        end
+
+        tests("sets Content-Disposition on create").returns("ho-ho-ho") do
+          object_attributes(@instance)["Content-Disposition"]
+        end
+      end
+
       tests('#metadata keys') do
         
         after do