fog 1.16.0 → 1.17.0

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.16.0'
+  VERSION = '1.17.0'
 end

data/lib/fog/vsphere/compute.rb

@@ -103,6 +103,7 @@ module Fog
           :tools_version => 'guest.toolsVersionStatus',
           :memory_mb => 'config.hardware.memoryMB',
           :cpus   => 'config.hardware.numCPU',
+          :corespersocket   => 'config.hardware.numCoresPerSocket',
           :overall_status => 'overallStatus',
           :guest_id => 'config.guestId',
         }
@@ -342,8 +343,35 @@ module Fog
           @vsphere_ssl      = options[:vsphere_ssl] || true
           @vsphere_expected_pubkey_hash = options[:vsphere_expected_pubkey_hash]
           @vsphere_must_reauthenticate = false
-
+          @vsphere_is_vcenter = nil
           @connection = nil
+          connect
+          negotiate_revision(options[:vsphere_rev])
+          authenticate
+        end
+
+        def reload
+          connect
+          # Check if the negotiation was ever run
+          if @vsphere_is_vcenter.nil?
+            negotiate
+          end
+          authenticate
+        end
+
+        private
+        def negotiate_revision(revision = nil)
+          # Negotiate the API revision
+          if not revision
+            rev = @connection.serviceContent.about.apiVersion
+            @connection.rev = [ rev, ENV['FOG_VSPHERE_REV'] || '4.1' ].min
+          end
+
+          @vsphere_is_vcenter = @connection.serviceContent.about.apiType == "VirtualCenter"
+          @vsphere_rev = @connection.rev
+        end
+
+        def connect
           # This is a state variable to allow digest validation of the SSL cert
           bad_cert = false
           loop do
@@ -365,21 +393,8 @@ module Fog
           if bad_cert then
             validate_ssl_connection
           end
-
-          # Negotiate the API revision
-          if not options[:vsphere_rev]
-            rev = @connection.serviceContent.about.apiVersion
-            @connection.rev = [ rev, ENV['FOG_VSPHERE_REV'] || '4.1' ].min
-          end
-
-          @vsphere_is_vcenter = @connection.serviceContent.about.apiType == "VirtualCenter"
-          @vsphere_rev = @connection.rev
-
-          authenticate
         end
 
-        private
-
         def authenticate
           begin
             @connection.serviceContent.sessionManager.Login :userName => @vsphere_username,

data/lib/fog/vsphere/models/compute/server.rb

@@ -36,6 +36,7 @@ module Fog
         attribute :relative_path
         attribute :memory_mb
         attribute :cpus
+        attribute :corespersocket
         attribute :interfaces
         attribute :volumes
         attribute :customvalues
@@ -66,12 +67,12 @@ module Fog
 
         def vm_reconfig_memory(options = {})
           requires :instance_uuid, :memory
-          service.vm_reconfig_memory('instance_uuid' => instance_uuid, 'memory' => memory)
+          service.vm_reconfig_memory('instance_uuid' => instance_uuid, 'memory' => memory_mb)
         end
 
         def vm_reconfig_cpus(options = {})
-          requires :instance_uuid, :cpus
-          service.vm_reconfig_cpus('instance_uuid' => instance_uuid, 'cpus' => cpus)
+          requires :instance_uuid, :cpus, :corespersocket
+          service.vm_reconfig_cpus('instance_uuid' => instance_uuid, 'cpus' => cpus, 'corespersocket' => corespersocket)
         end
 
         def vm_reconfig_hardware(hardware_spec, options = {})
@@ -121,19 +122,25 @@ module Fog
         #
         def clone(options = {})
           requires :name, :datacenter, :relative_path
+
           # Convert symbols to strings
           req_options = options.inject({}) { |hsh, (k,v)| hsh[k.to_s] = v; hsh }
+
           # Give our path to the request
           req_options['template_path'] ="#{relative_path}/#{name}"
           req_options['datacenter'] = "#{datacenter}"
+
           # Perform the actual clone
           clone_results = service.vm_clone(req_options)
+
+          # We need to assign the service, otherwise we can't reload the model
           # Create the new VM model. TODO This only works when "wait=true"
-          new_vm = self.class.new(clone_results['new_vm'])
-          # We need to assign the collection and the connection otherwise we
+          new_vm = self.class.new(clone_results['new_vm'].merge(:service => self.service))
+
+          # We need to assign the collection otherwise we
           # cannot reload the model.
           new_vm.collection = self.collection
-          new_vm.service = service
+
           # Return the new VM model.
           new_vm
         end
@@ -162,6 +169,10 @@ module Fog
           memory_mb * 1024 * 1024
         end
 
+        def sockets
+          cpus / corespersocket
+        end
+        
         def mac
           interfaces.first.mac unless interfaces.empty?
         end
@@ -230,6 +241,7 @@ module Fog
         def defaults
           {
             :cpus      => 1,
+#            :corespersocket => 1,
             :memory_mb => 512,
 #            :guest_id  => 'otherGuest',
             :path      => '/'

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

@@ -10,6 +10,7 @@ module Fog
             :guestId      => attributes[:guest_id],
             :files        => { :vmPathName => vm_path_name(attributes) },
             :numCPUs      => attributes[:cpus],
+            :numCoresPerSocket => attributes[:corespersocket],
             :memoryMB     => attributes[:memory_mb],
             :deviceChange => device_change(attributes),
             :extraConfig  => extra_config(attributes),

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

@@ -141,6 +141,8 @@ module Fog
           # Options['numCPUs'] or Options['memoryMB']
           # Build up the specification for Hardware, for more details see ____________
           # https://github.com/rlane/rbvmomi/blob/master/test/test_serialization.rb
+          # http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim.vm.ConfigSpec.html
+          # FIXME: pad this out with the rest of the useful things in VirtualMachineConfigSpec
           virtual_machine_config_spec.numCPUs = options['numCPUs'] if  ( options.has_key?('numCPUs') )
           virtual_machine_config_spec.memoryMB = options['memoryMB'] if ( options.has_key?('memoryMB') )
           # Options['customization_spec']
@@ -189,15 +191,6 @@ module Fog
           end
           customization_spec ||= nil
 
-          # FIXME: pad this out with the rest of the useful things in VirtualMachineConfigSpec
-          # http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim.vm.ConfigSpec.html
-          if options.has_key?('memoryMB') || options.has_key?('numCPUs')
-            virtual_machine_config_spec = {
-              :memoryMB => options['memoryMB'],
-              :numCPUs  => options['numCPUs']
-            }
-          end
-
           relocation_spec=nil
           if ( options['linked_clone'] )
             # cribbed heavily from the rbvmomi clone_vm.rb

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

@@ -5,7 +5,7 @@ module Fog
         def vm_reconfig_cpus(options = {})
           raise ArgumentError, "cpus is a required parameter" unless options.has_key? 'cpus'
           raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid'
-          hardware_spec={'numCPUs' => options['cpus']}
+          hardware_spec={'numCPUs' => options['cpus'], 'numCoresPerSocket' => options['corespersocket']}
           vm_reconfig_hardware('instance_uuid' => options['instance_uuid'], 'hardware_spec' => hardware_spec )
         end
       end
@@ -14,7 +14,7 @@ module Fog
         def vm_reconfig_cpus(options = {})
           raise ArgumentError, "cpus is a required parameter" unless options.has_key? 'cpus'
           raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid'
-          hardware_spec={'numCPUs' => options['cpus']}
+          hardware_spec={'numCPUs' => options['cpus'], 'numCoresPerSocket' => options['corespersocket']}
           vm_reconfig_hardware('instance_uuid' => options['instance_uuid'], 'hardware_spec' => hardware_spec )
         end
       end

data/lib/fog/xenserver/requests/compute/create_server.rb

@@ -31,7 +31,7 @@ module Fog
               PV_kernel
               PV_ramdisk
               PV_legacy_args
-              HVM_boot_params
+              HVM_boot_policy
               HVM_boot_params
           }.each do |k|
             if config[k.downcase.to_sym]

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

@@ -116,6 +116,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
       'instanceType'        => String,
       'availabilityZone'    => String,
       'start'               => Time,
+      'end'                 => Time,
       'duration'            => Integer,
       'fixedPrice'          => Float,
       'usagePrice'          => Float,

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

@@ -24,14 +24,14 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
     }
     @bucket_lifecycle_format = {
       'Rules' => [{
-         'ID'         => String, 
+         'ID'         => String,
          'Prefix'     => Fog::Nullable::String,
-         'Enabled'    => Fog::Boolean, 
+         'Enabled'    => Fog::Boolean,
          'Expiration' => Fog::Nullable::Hash,
          'Transition' => Fog::Nullable::Hash
        }]
     }
-      
+
     @service_format = {
       'Buckets' => [{
         'CreationDate'  => Time,
@@ -275,6 +275,22 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
       Fog::Storage[:aws].put_bucket_cors(@aws_bucket_name, cors)
     end
 
+    tests("bucket tagging") do
+
+      tests("#put_bucket_tagging('#{@aws_bucket_name}')").succeeds do
+        Fog::Storage[:aws].put_bucket_tagging(@aws_bucket_name, {'Key1' => 'Value1', 'Key2' => 'Value2'})
+      end
+
+      tests("#get_bucket_tagging('#{@aws_bucket_name}')").
+        returns('BucketTagging' => {'Key1' => 'Value1', 'Key2' => 'Value2'}) do
+        Fog::Storage[:aws].get_bucket_tagging(@aws_bucket_name).body
+      end
+
+      tests("#delete_bucket_tagging('#{@aws_bucket_name}')").succeeds do
+        Fog::Storage[:aws].delete_bucket_tagging(@aws_bucket_name)
+      end
+    end
+
     tests("#delete_bucket('#{@aws_bucket_name}')").succeeds do
       Fog::Storage[:aws].delete_bucket(@aws_bucket_name)
     end

data/tests/brightbox/compute/schema.rb

@@ -581,6 +581,7 @@ class Brightbox
           "listeners"       => [Brightbox::Compute::Formats::Struct::LB_LISTENER],
           "policy"          => String,
           "healthcheck"     => Brightbox::Compute::Formats::Struct::LB_HEALTHCHECK,
+          "certificate"     => Fog::Nullable::Hash,
           "created_at"      => String,
           "deleted_at"      => Fog::Nullable::String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,

data/tests/core/credential_tests.rb

@@ -54,7 +54,13 @@ Shindo.tests do
     returns(nil, 'File.expand_path raises because of non-absolute path') {
       ENV.delete('FOG_RC')
       ENV['HOME'] = '.'
-      Fog.credentials_path
+
+      if RUBY_PLATFORM == 'java'
+        Fog::Logger.warning("Stubbing out non-absolute path credentials test due to JRuby bug: https://github.com/jruby/jruby/issues/1163")
+        nil
+      else
+        Fog.credentials_path
+      end
     }
 
     returns(nil, 'returns nil when neither FOG_RC or HOME are set') {

data/tests/core/parser_tests.rb

@@ -46,7 +46,7 @@ posuere eu odio. Donec sodales, ante porta condimentum
 }
 
   @xmlNS = %{
-<myns:MyResponse>
+<myns:MyResponse xmlns:myns="http://www.example.com/">
   <myns:MyObject>
     <myns:key1>value1</myns:key1>
     <myns:key2>value2</myns:key2>

data/tests/rackspace/block_storage_tests.rb

@@ -79,7 +79,7 @@ Shindo.tests('Fog::Rackspace::BlockStorage', ['rackspace']) do
     pending if Fog.mocking?
 
     tests('no params').succeeds do
-      @service = Fog::Rackspace::BlockStorage.new
+      @service = Fog::Rackspace::BlockStorage.new :rackspace_region => nil
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
       returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil }
       @service.list_volumes

data/tests/rackspace/cdn_tests.rb

@@ -76,7 +76,7 @@ Shindo.tests('Fog::CDN::Rackspace', ['rackspace']) do
     pending if Fog.mocking?
     
     tests('no params').succeeds do
-      @service = Fog::CDN::Rackspace.new
+      @service = Fog::CDN::Rackspace.new :rackspace_region => nil
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
       returns(true, "uses DFW") { (@service.instance_variable_get("@uri").host =~ /cdn1/) != nil }
       @service.get_containers

data/tests/rackspace/compute_tests.rb

@@ -65,7 +65,7 @@ Shindo.tests('Rackspace | Compute', ['rackspace']) do
     pending if Fog.mocking?
 
     tests('no params').succeeds do
-      @service = Fog::Compute::Rackspace.new
+      @service = Fog::Compute::Rackspace.new :rackspace_region => nil
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
       returns(true) { (@service.instance_variable_get("@uri").host == 'servers.api.rackspacecloud.com') != nil }
       @service.list_flavors

data/tests/rackspace/compute_v2_tests.rb

@@ -78,7 +78,7 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do
     pending if Fog.mocking?
 
     tests('no params').succeeds do
-      @service = Fog::Compute::RackspaceV2.new
+      @service = Fog::Compute::RackspaceV2.new :rackspace_region => nil
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
       returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil }
       @service.list_flavors

data/tests/rackspace/databases_tests.rb

@@ -79,7 +79,7 @@ Shindo.tests('Fog::Rackspace::Databases', ['rackspace']) do |variable|
     pending if Fog.mocking?
 
     tests('no params').succeeds do
-      @service = Fog::Rackspace::Databases.new
+      @service = Fog::Rackspace::Databases.new :rackspace_region => nil
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
       returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil }
       @service.flavors

data/tests/rackspace/dns_tests.rb

@@ -69,7 +69,7 @@ Shindo.tests('Fog::DNS::Rackspace', ['rackspace']) do
     pending if Fog.mocking?
 
     tests('no params').succeeds do
-      @service = Fog::DNS::Rackspace.new
+      @service = Fog::DNS::Rackspace.new :rackspace_region => nil
       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

data/tests/rackspace/load_balancer_tests.rb

@@ -78,7 +78,7 @@ Shindo.tests('Fog::Rackspace::LoadBalancers', ['rackspace']) do
     pending if Fog.mocking?
 
     tests('no params').succeeds do
-      @service = Fog::Rackspace::LoadBalancers.new
+      @service = Fog::Rackspace::LoadBalancers.new :rackspace_region => nil
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
       returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw/) != nil }
       @service.list_load_balancers

data/tests/rackspace/storage_tests.rb

@@ -76,7 +76,7 @@ Shindo.tests('Rackspace | Storage', ['rackspace']) do
     pending if Fog.mocking?
     
     tests('no params').succeeds do
-      @service = Fog::Storage::Rackspace.new
+      @service = Fog::Storage::Rackspace.new :rackspace_region => nil
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
       returns(true) { (@service.instance_variable_get("@uri").host =~ /dfw\d/) != nil }
       @service.head_containers

data/tests/vcloud_director/ensure_list_tests.rb

@@ -5,7 +5,7 @@ Shindo.tests('Compute::VcloudDirector | ensure_list!', ['vclouddirector']) do
 
     @service = Fog::Compute::VcloudDirector.new
 
-    tests('#ensure_list! for single key') do
+    tests('#ensure_list! for single key ensures our key has an array as a value') do
       tests('for key with a hash').returns(Array) do
         testdata = {:k => {:A => '1'}}
         @service.ensure_list!(testdata, :k)
@@ -31,7 +31,7 @@ Shindo.tests('Compute::VcloudDirector | ensure_list!', ['vclouddirector']) do
       end
     end
 
-    tests ('#ensure_list! for nested keys') do
+    tests('#ensure_list! for nested keys ensures that the child key has an array as a value') do
       tests('with no key').returns(Array) do
         testdata = {}
         @service.ensure_list!(testdata, :keys, :key)
@@ -51,6 +51,34 @@ Shindo.tests('Compute::VcloudDirector | ensure_list!', ['vclouddirector']) do
       end
     end
 
+    tests('#ensure_list! with parent and child keys does not effect existing data') do
+      tests('for existing array').returns([:one, :two]) do
+        testdata = {:keys => {:key => [:one, :two]}}
+        @service.ensure_list!(testdata, :keys, :key)
+        testdata[:keys][:key]
+      end
+
+      tests('for existing hash').returns([{:one => :two}]) do
+        testdata = {:keys => {:key => {:one => :two}}}
+        @service.ensure_list!(testdata, :keys, :key)
+        testdata[:keys][:key]
+      end
+    end
+
+    tests('#ensure_list! with single key does not effect existing data') do
+      tests('for existing array').returns([:one, :two]) do
+        testdata = {:k => [:one, :two]}
+        @service.ensure_list!(testdata, :k)
+        testdata[:k]
+      end
+
+      tests('for existing hash').returns([{:one => 'two'}]) do
+        testdata = {:k => {:one => 'two'}}
+        @service.ensure_list!(testdata, :k)
+        testdata[:k]
+      end
+    end
+
   end
 
 end

data/tests/vcloud_director/requests/compute/disk_tests.rb

@@ -1,6 +1,166 @@
 Shindo.tests('Compute::VcloudDirector | disk requests', ['vclouddirector']) do
 
   @service = Fog::Compute::VcloudDirector.new
+  @disk_name = VcloudDirector::Compute::Helper.test_name
+
+  tests('error conditions') do
+    tests('#post_upload_disk') do
+      tests('Invalid size').raises(Fog::Compute::VcloudDirector::BadRequest) do
+        @service.post_upload_disk('00000000-0000-0000-0000-000000000000', @disk_name, -1)
+      end
+    end
+    tests('Upload to non-existent vDC').raises(Fog::Compute::VcloudDirector::Forbidden) do
+      @service.post_upload_disk('00000000-0000-0000-0000-000000000000', @disk_name, 0)
+    end
+    tests('Retrieve non-existent Disk').raises(Fog::Compute::VcloudDirector::Forbidden) do
+      @service.get_disk('00000000-0000-0000-0000-000000000000')
+    end
+    tests('Retrieve owner of non-existent Disk').raises(Fog::Compute::VcloudDirector::Forbidden) do
+      @service.get_disk_owner('00000000-0000-0000-0000-000000000000')
+    end
+    tests('Retrieve VM list for non-existent Disk').raises(Fog::Compute::VcloudDirector::Forbidden) do
+      @service.get_vms_disk_attached_to('00000000-0000-0000-0000-000000000000')
+    end
+    tests('Delete non-existent Disk').raises(Fog::Compute::VcloudDirector::Forbidden) do
+      @service.delete_disk('00000000-0000-0000-0000-000000000000')
+    end
+  end
+
+  @org = VcloudDirector::Compute::Helper.current_org(@service)
+  @size = 1024
+
+  tests('Upload and manipulate a disk') do
+    tests('#post_upload_disk').data_matches_schema(VcloudDirector::Compute::Schema::DISK_TYPE) do
+      @vdc_id = VcloudDirector::Compute::Helper.first_vdc_id(@org)
+      @disk = @service.post_upload_disk(@vdc_id, @disk_name, @size).body
+    end
+    @service.process_task(@disk[:Tasks][:Task])
+    @disk_id = @disk[:href].split('/').last
+
+    tests("#get_disk(#{@disk_id})").data_matches_schema(VcloudDirector::Compute::Schema::DISK_TYPE) do
+      @disk = @service.get_disk(@disk_id).body
+    end
+    tests("disk[:name]").returns(@disk_name) { @disk[:name] }
+    tests("disk[:size]").returns(@size) { @disk[:size].to_i }
+
+    tests("#get_disk_owner(#{@disk_id})").data_matches_schema(VcloudDirector::Compute::Schema::OWNER_TYPE) do
+      @owner = @service.get_disk_owner(@disk_id).body
+    end
+    tests("owner[:User][:name]").returns(@service.user_name) { @owner[:User][:name] }
+
+    #tests("#put_disk(#{@disk_id})").data_matches_schema(VcloudDirector::Compute::Schema::TASK_TYPE) do
+    #  @disk_name += '-renamed'
+    #  @task = @service.put_disk(@disk_id, @disk_name).body
+    #end
+    #@service.process_task(@task)
+    #tests("#get_disk(#{@disk_id})").data_matches_schema(VcloudDirector::Compute::Schema::DISK_TYPE) do
+    #  @disk = @service.get_disk(@disk_id).body
+    #end
+    #tests("disk[:name]").returns(@disk_name) { @disk[:name] }
+    #tests("disk[:size]").returns(@size) { @disk[:size].to_i } # shouldn't change
+
+    tests('disk metadata') do
+      pending if Fog.mocking?
+
+      tests("#put_disk_metadata_item_metadata(#{@disk_id})").data_matches_schema(VcloudDirector::Compute::Schema::TASK_TYPE) do
+        @task = @service.put_disk_metadata_item_metadata(@disk_id, 'fog-test-key', 'fog-test-value').body
+      end
+      @service.process_task(@task)
+
+      tests("#put_disk_metadata_item_metadata(#{@disk_id})") do
+        tests("#put_disk_metadata_item_metadata(Boolean)").returns(true) do
+          task = @service.put_disk_metadata_item_metadata(@disk_id, 'fog-test-boolean', true).body
+          @service.process_task(task)
+        end
+        tests("#put_disk_metadata_item_metadata(DateTime)").returns(true) do
+          task = @service.put_disk_metadata_item_metadata(@disk_id, 'fog-test-datetime', DateTime.now).body
+          @service.process_task(task)
+        end
+        tests("#put_disk_metadata_item_metadata(Number)").returns(true) do
+          task = @service.put_disk_metadata_item_metadata(@disk_id, 'fog-test-number', 111).body
+          @service.process_task(task)
+        end
+      end
+
+      tests("#post_update_disk_metadata(#{@disk_id})").data_matches_schema(VcloudDirector::Compute::Schema::TASK_TYPE) do
+        metadata = {
+          'fog-test-key-update' => 'fog-test-value-update',
+          'fog-test-boolean-update' => false,
+          'fog-test-datetime-update' => DateTime.now,
+          'fog-test-number-update' => 222
+        }
+        @task = @service.post_update_disk_metadata(@disk_id, metadata).body
+      end
+      @service.process_task(@task)
+
+      tests("#get_disk_metadata(#{@disk_id})") do
+        tests('response format').data_matches_schema(VcloudDirector::Compute::Schema::METADATA_TYPE) do
+          @metadata = @service.get_disk_metadata(@disk_id).body
+        end
+        tests('TypedValue') do
+          pending if @service.api_version.to_f < 5.1
+          tests('key').returns('MetadataStringValue') do
+            entry = @metadata[:MetadataEntry].detect {|e| e[:Key] == 'fog-test-key'}
+            entry[:TypedValue][:xsi_type]
+          end
+          tests('boolean').returns('MetadataBooleanValue') do
+            entry = @metadata[:MetadataEntry].detect {|e| e[:Key] == 'fog-test-boolean'}
+            entry[:TypedValue][:xsi_type]
+          end
+          tests('datetime').returns('MetadataDateTimeValue') do
+            entry = @metadata[:MetadataEntry].detect {|e| e[:Key] == 'fog-test-datetime'}
+            entry[:TypedValue][:xsi_type]
+          end
+          tests('number').returns('MetadataNumberValue') do
+            entry = @metadata[:MetadataEntry].detect {|e| e[:Key] == 'fog-test-number'}
+            entry[:TypedValue][:xsi_type]
+          end
+          tests('key-update').returns('MetadataStringValue') do
+            entry = @metadata[:MetadataEntry].detect {|e| e[:Key] == 'fog-test-key-update'}
+            entry[:TypedValue][:xsi_type]
+          end
+          tests('boolean-update').returns('MetadataBooleanValue') do
+            entry = @metadata[:MetadataEntry].detect {|e| e[:Key] == 'fog-test-boolean-update'}
+            entry[:TypedValue][:xsi_type]
+          end
+          tests('datetime-update').returns('MetadataDateTimeValue') do
+            entry = @metadata[:MetadataEntry].detect {|e| e[:Key] == 'fog-test-datetime-update'}
+            entry[:TypedValue][:xsi_type]
+          end
+          tests('number-update').returns('MetadataNumberValue') do
+            entry = @metadata[:MetadataEntry].detect {|e| e[:Key] == 'fog-test-number-update'}
+            entry[:TypedValue][:xsi_type]
+          end
+        end
+      end
+    end
+
+    tests("#get_vms_disk_attached_to(#{@disk_id})").data_matches_schema(VcloudDirector::Compute::Schema::VMS_TYPE) do
+      pending if Fog.mocking?
+      @service.get_vms_disk_attached_to(@disk_id).body
+    end
+
+    tests("#delete_disk(#{@disk_id})").data_matches_schema(VcloudDirector::Compute::Schema::TASK_TYPE) do
+      @task = @service.delete_disk(@disk_id).body
+    end
+    @service.process_task(@task)
+  end
+
+  tests('Disk no longer exists') do
+    tests("#get_disk(#{@disk_id})").raises(Fog::Compute::VcloudDirector::Forbidden) do
+      @service.get_disk(@disk_id)
+    end
+    tests("#get_disk_owner(#{@disk_id})").raises(Fog::Compute::VcloudDirector::Forbidden) do
+      @service.get_disk_owner(@disk_id)
+    end
+    tests("#get_disk_metadata(#{@disk_id})").raises(Fog::Compute::VcloudDirector::Forbidden) do
+      pending if Fog.mocking?
+      @service.get_disk_metadata(@disk_id)
+    end
+    tests("#delete_disk(#{@disk_id})").raises(Fog::Compute::VcloudDirector::Forbidden) do
+      @service.delete_disk(@disk_id)
+    end
+  end
 
   tests('#get_disks_from_query') do
     pending if Fog.mocking?
@@ -15,9 +175,4 @@ Shindo.tests('Compute::VcloudDirector | disk requests', ['vclouddirector']) do
     end
   end
 
-  tests('Retrieve non-existent Disk').raises(Fog::Compute::VcloudDirector::Forbidden) do
-    pending if Fog.mocking?
-    @service.get_disk('00000000-0000-0000-0000-000000000000')
-  end
-
 end