fog-maestrodev 1.15.0.20130927082724 → 1.18.0.20131111203459

data/lib/fog/vcloud_director/models/compute/vm.rb

@@ -17,7 +17,7 @@ module Fog
         attribute :operating_system
         attribute :ip_address
         attribute :cpu, :type => :integer
-        attribute :memory
+        attribute :memory, :type => :integer
         attribute :hard_disks, :aliases => :disks
 
         def reload
@@ -42,14 +42,76 @@ module Fog
           self
         end
 
+        # Power off the VM.
+        def power_off
+          requires :id
+          begin
+            response = service.post_power_off_vapp(id)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
+          service.process_task(response.body)
+        end
 
+        # Power on the VM.
         def power_on
-          response = service.post_vm_poweron(id)
+          requires :id
+          begin
+            response = service.post_power_on_vapp(id)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
           service.process_task(response.body)
         end
 
-        def power_off
-          response = service.post_vm_poweroff(id)
+
+        # Reboot the VM.
+        def reboot
+          requires :id
+          begin
+            response = service.post_reboot_vapp(id)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
+          service.process_task(response.body)
+        end
+
+        # Reset the VM.
+        def reset
+          requires :id
+          begin
+            response = service.post_reset_vapp(id)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
+          service.process_task(response.body)
+        end
+
+        # Shut down the VM.
+        def shutdown
+          requires :id
+          begin
+            response = service.post_shutdown_vapp(id)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
+          service.process_task(response.body)
+        end
+
+        # Suspend the VM.
+        def suspend
+          requires :id
+          begin
+            response = service.post_suspend_vapp(id)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
           service.process_task(response.body)
         end
 
@@ -59,11 +121,13 @@ module Fog
         end
 
         def customization
+          requires :id
           data = service.get_vm_customization(id).body
           service.vm_customizations.new(data)
         end
 
         def network
+          requires :id
           data = service.get_vm_network(id).body
           service.vm_networks.new(data)
         end
@@ -78,7 +142,7 @@ module Fog
           not_first_set = !memory.nil?
           attributes[:memory] = new_memory.to_i
           if not_first_set && has_changed
-            response = service.put_vm_memory(id, memory)
+            response = service.put_memory(id, memory)
             service.process_task(response.body)
           end
         end
@@ -88,11 +152,21 @@ module Fog
           not_first_set = !cpu.nil?
           attributes[:cpu] = new_cpu.to_i
           if not_first_set && has_changed
-            response = service.put_vm_cpu(id, cpu)
+            response = service.put_cpu(id, cpu)
             service.process_task(response.body)
           end
         end
 
+        def ready?
+          reload
+          status == 'on'
+        end
+
+        def vapp
+          # get_by_metadata returns a vm collection where every vapp parent is orpahn
+          collection.vapp ||= service.vapps.get(vapp_id)
+        end
+
       end
     end
   end

data/lib/fog/vcloud_director/models/compute/vm_customization.rb

@@ -20,7 +20,8 @@ module Fog
         attribute :computer_name
         attribute :has_customization_script
 
-        # bug: for some reason if the customization_script has /r, is showed here as /n. Looks likes is something in excon
+        # bug: for some reason if the customization_script has /r, is showed
+        # here as /n. Looks likes is something in excon
         def script
           attributes[:customization_script]
         end
@@ -30,7 +31,7 @@ module Fog
         end
 
         def save
-          response = service.put_vm_customization(id, attributes)
+          response = service.put_guest_customization_section_vapp(id, attributes)
           service.process_task(response.body)
         end
 

data/lib/fog/vcloud_director/models/compute/vm_network.rb

@@ -20,7 +20,7 @@ module Fog
         attribute :ip_address_allocation_mode
 
         def save
-          response = service.put_vm_network(id, attributes)
+          response = service.put_network_connection_system_section_vapp(id, attributes)
           service.process_task(response.body)
         end
 

data/lib/fog/vcloud_director/parsers/compute/metadata.rb

@@ -1,35 +1,33 @@
-#
-# <Metadata xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.metadata+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd">
-#     <Link rel="up" type="application/vnd.vmware.vcloud.vm+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112"/>
-#     <Link rel="add" type="application/vnd.vmware.vcloud.metadata+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata"/>
-#     <MetadataEntry type="application/vnd.vmware.vcloud.metadata.value+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata/buenas%20si">
-#         <Link rel="up" type="application/vnd.vmware.vcloud.metadata+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata"/>
-#         <Link rel="edit" type="application/vnd.vmware.vcloud.metadata.value+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata/buenas%20si"/>
-#         <Link rel="remove" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata/buenas%20si"/>
-#         <Key>buenas si</Key>
-#         <Value>no tanto ya</Value>
-#     </MetadataEntry>
-#     <MetadataEntry type="application/vnd.vmware.vcloud.metadata.value+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata/hola">
-#         <Link rel="up" type="application/vnd.vmware.vcloud.metadata+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata"/>
-#         <Link rel="edit" type="application/vnd.vmware.vcloud.metadata.value+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata/hola"/>
-#         <Link rel="remove" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata/hola"/>
-#         <Key>hola</Key>
-#         <Value>adios</Value>
-#     </MetadataEntry>
-# </Metadata>
-#
-#
-# {:metadata=>{"buenas si"=>"no tanto ya", "hola"=>"adios"},
-#  :type=>"application/vnd.vmware.vcloud.metadata+xml",
-#  :href=>
-#   "https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata",
-#  :id=>"vm-18545e82-d919-4071-ae7e-d1300d9d8112"}
-#
 module Fog
   module Parsers
     module Compute
       module VcloudDirector
-
+        #
+        # <Metadata xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.metadata+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd">
+        #     <Link rel="up" type="application/vnd.vmware.vcloud.vm+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112"/>
+        #     <Link rel="add" type="application/vnd.vmware.vcloud.metadata+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata"/>
+        #     <MetadataEntry type="application/vnd.vmware.vcloud.metadata.value+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata/buenas%20si">
+        #         <Link rel="up" type="application/vnd.vmware.vcloud.metadata+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata"/>
+        #         <Link rel="edit" type="application/vnd.vmware.vcloud.metadata.value+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata/buenas%20si"/>
+        #         <Link rel="remove" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata/buenas%20si"/>
+        #         <Key>buenas si</Key>
+        #         <Value>no tanto ya</Value>
+        #     </MetadataEntry>
+        #     <MetadataEntry type="application/vnd.vmware.vcloud.metadata.value+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata/hola">
+        #         <Link rel="up" type="application/vnd.vmware.vcloud.metadata+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata"/>
+        #         <Link rel="edit" type="application/vnd.vmware.vcloud.metadata.value+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata/hola"/>
+        #         <Link rel="remove" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata/hola"/>
+        #         <Key>hola</Key>
+        #         <Value>adios</Value>
+        #     </MetadataEntry>
+        # </Metadata>
+        #
+        # {:metadata=>{"buenas si"=>"no tanto ya", "hola"=>"adios"},
+        #  :type=>"application/vnd.vmware.vcloud.metadata+xml",
+        #  :href=>
+        #   "https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata",
+        #  :id=>"vm-18545e82-d919-4071-ae7e-d1300d9d8112"}
+        #
         class Metadata < VcloudDirectorParser
 
           def reset
@@ -59,7 +57,6 @@ module Fog
           end
 
         end
-
       end
     end
   end

data/lib/fog/vcloud_director/parsers/compute/network.rb

@@ -1,68 +1,67 @@
-#
-#{:xmlns=>"http://www.vmware.com/vcloud/v1.5",
-# :xmlns_xsi=>"http://www.w3.org/2001/XMLSchema-instance",
-# :name=>"DevOps - Dev Network Connection",
-# :id=>"urn:vcloud:network:d5f47bbf-de27-4cf5-aaaa-56772f2ccd17",
-# :type=>"application/vnd.vmware.vcloud.orgNetwork+xml",
-# :href=>
-#  "https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17",
-# :xsi_schemaLocation=>
-#  "http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd",
-# :Link=>
-#  [{:rel=>"up",
-#    :type=>"application/vnd.vmware.vcloud.org+xml",
-#    :name=>"DevOps",
-#    :href=>
-#     "https://example.com/api/org/c6a4c623-c158-41cf-a87a-dbc1637ad55a"},
-#   {:rel=>"down",
-#    :type=>"application/vnd.vmware.vcloud.metadata+xml",
-#    :href=>
-#     "https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17/metadata"}],
-# :Description=>"",
-# :Configuration=>
-#  {:IpScope=>
-#    {:IsInherited=>"true",
-#     :Gateway=>"10.192.0.1",
-#     :Netmask=>"255.255.252.0",
-#     :Dns1=>"10.192.0.11",
-#     :Dns2=>"10.192.0.12",
-#     :DnsSuffix=>"dev.ad.mdsol.com",
-#     :IpRanges=>
-#      {:IpRange=>
-#        {:StartAddress=>"10.192.0.100", :EndAddress=>"10.192.3.254"}}},
-#   :FenceMode=>"bridged",
-#   :RetainNetInfoAcrossDeployments=>"false"}}
-#
-#<?xml version="1.0" encoding="UTF-8"?>
-#<OrgNetwork xmlns="http://www.vmware.com/vcloud/v1.5" name="DevOps - Dev Network Connection" id="urn:vcloud:network:d5f47bbf-de27-4cf5-aaaa-56772f2ccd17" type="application/vnd.vmware.vcloud.orgNetwork+xml" href="https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd">
-#    <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" name="DevOps" href="https://example.com/api/org/c6a4c623-c158-41cf-a87a-dbc1637ad55a"/>
-#    <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17/metadata"/>
-#    <Description/>
-#    <Configuration>
-#        <IpScope>
-#            <IsInherited>true</IsInherited>
-#            <Gateway>10.192.0.1</Gateway>
-#            <Netmask>255.255.252.0</Netmask>
-#            <Dns1>10.192.0.11</Dns1>
-#            <Dns2>10.192.0.12</Dns2>
-#            <DnsSuffix>dev.ad.mdsol.com</DnsSuffix>
-#            <IpRanges>
-#                <IpRange>
-#                    <StartAddress>10.192.0.100</StartAddress>
-#                    <EndAddress>10.192.3.254</EndAddress>
-#                </IpRange>
-#            </IpRanges>
-#        </IpScope>
-#        <FenceMode>bridged</FenceMode>
-#        <RetainNetInfoAcrossDeployments>false</RetainNetInfoAcrossDeployments>
-#    </Configuration>
-#</OrgNetwork>
-#
 module Fog
   module Parsers
     module Compute
       module VcloudDirector
-
+        #
+        #{:xmlns=>"http://www.vmware.com/vcloud/v1.5",
+        # :xmlns_xsi=>"http://www.w3.org/2001/XMLSchema-instance",
+        # :name=>"DevOps - Dev Network Connection",
+        # :id=>"urn:vcloud:network:d5f47bbf-de27-4cf5-aaaa-56772f2ccd17",
+        # :type=>"application/vnd.vmware.vcloud.orgNetwork+xml",
+        # :href=>
+        #  "https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17",
+        # :xsi_schemaLocation=>
+        #  "http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd",
+        # :Link=>
+        #  [{:rel=>"up",
+        #    :type=>"application/vnd.vmware.vcloud.org+xml",
+        #    :name=>"DevOps",
+        #    :href=>
+        #     "https://example.com/api/org/c6a4c623-c158-41cf-a87a-dbc1637ad55a"},
+        #   {:rel=>"down",
+        #    :type=>"application/vnd.vmware.vcloud.metadata+xml",
+        #    :href=>
+        #     "https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17/metadata"}],
+        # :Description=>"",
+        # :Configuration=>
+        #  {:IpScope=>
+        #    {:IsInherited=>"true",
+        #     :Gateway=>"10.192.0.1",
+        #     :Netmask=>"255.255.252.0",
+        #     :Dns1=>"10.192.0.11",
+        #     :Dns2=>"10.192.0.12",
+        #     :DnsSuffix=>"dev.ad.mdsol.com",
+        #     :IpRanges=>
+        #      {:IpRange=>
+        #        {:StartAddress=>"10.192.0.100", :EndAddress=>"10.192.3.254"}}},
+        #   :FenceMode=>"bridged",
+        #   :RetainNetInfoAcrossDeployments=>"false"}}
+        #
+        #<?xml version="1.0" encoding="UTF-8"?>
+        #<OrgNetwork xmlns="http://www.vmware.com/vcloud/v1.5" name="DevOps - Dev Network Connection" id="urn:vcloud:network:d5f47bbf-de27-4cf5-aaaa-56772f2ccd17" type="application/vnd.vmware.vcloud.orgNetwork+xml" href="https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd">
+        #    <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" name="DevOps" href="https://example.com/api/org/c6a4c623-c158-41cf-a87a-dbc1637ad55a"/>
+        #    <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17/metadata"/>
+        #    <Description/>
+        #    <Configuration>
+        #        <IpScope>
+        #            <IsInherited>true</IsInherited>
+        #            <Gateway>10.192.0.1</Gateway>
+        #            <Netmask>255.255.252.0</Netmask>
+        #            <Dns1>10.192.0.11</Dns1>
+        #            <Dns2>10.192.0.12</Dns2>
+        #            <DnsSuffix>dev.ad.mdsol.com</DnsSuffix>
+        #            <IpRanges>
+        #                <IpRange>
+        #                    <StartAddress>10.192.0.100</StartAddress>
+        #                    <EndAddress>10.192.3.254</EndAddress>
+        #                </IpRange>
+        #            </IpRanges>
+        #        </IpScope>
+        #        <FenceMode>bridged</FenceMode>
+        #        <RetainNetInfoAcrossDeployments>false</RetainNetInfoAcrossDeployments>
+        #    </Configuration>
+        #</OrgNetwork>
+        #
         class Network < VcloudDirectorParser
 
           def reset
@@ -101,7 +100,6 @@ module Fog
           end
 
         end
-
       end
     end
   end

data/lib/fog/vcloud_director/parsers/compute/vm_customization.rb

@@ -24,7 +24,7 @@ module Fog
 
           def end_element(name)
             case name
-            when 'Enabled',
+            when 'Enabled'
               @response[:enabled] = (value == "true")
             when 'ChangeSid'
               @response[:change_sid] = (value == "true")

data/lib/fog/vcloud_director/parsers/compute/vm_network.rb

@@ -1,68 +1,67 @@
-#
-#{:xmlns=>"http://www.vmware.com/vcloud/v1.5",
-# :xmlns_xsi=>"http://www.w3.org/2001/XMLSchema-instance",
-# :name=>"DevOps - Dev Network Connection",
-# :id=>"urn:vcloud:network:d5f47bbf-de27-4cf5-aaaa-56772f2ccd17",
-# :type=>"application/vnd.vmware.vcloud.orgNetwork+xml",
-# :href=>
-#  "https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17",
-# :xsi_schemaLocation=>
-#  "http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd",
-# :Link=>
-#  [{:rel=>"up",
-#    :type=>"application/vnd.vmware.vcloud.org+xml",
-#    :name=>"DevOps",
-#    :href=>
-#     "https://example.com/api/org/c6a4c623-c158-41cf-a87a-dbc1637ad55a"},
-#   {:rel=>"down",
-#    :type=>"application/vnd.vmware.vcloud.metadata+xml",
-#    :href=>
-#     "https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17/metadata"}],
-# :Description=>"",
-# :Configuration=>
-#  {:IpScope=>
-#    {:IsInherited=>"true",
-#     :Gateway=>"10.192.0.1",
-#     :Netmask=>"255.255.252.0",
-#     :Dns1=>"10.192.0.11",
-#     :Dns2=>"10.192.0.12",
-#     :DnsSuffix=>"dev.ad.mdsol.com",
-#     :IpRanges=>
-#      {:IpRange=>
-#        {:StartAddress=>"10.192.0.100", :EndAddress=>"10.192.3.254"}}},
-#   :FenceMode=>"bridged",
-#   :RetainNetInfoAcrossDeployments=>"false"}}
-#
-#<?xml version="1.0" encoding="UTF-8"?>
-#<OrgNetwork xmlns="http://www.vmware.com/vcloud/v1.5" name="DevOps - Dev Network Connection" id="urn:vcloud:network:d5f47bbf-de27-4cf5-aaaa-56772f2ccd17" type="application/vnd.vmware.vcloud.orgNetwork+xml" href="https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd">
-#    <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" name="DevOps" href="https://example.com/api/org/c6a4c623-c158-41cf-a87a-dbc1637ad55a"/>
-#    <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17/metadata"/>
-#    <Description/>
-#    <Configuration>
-#        <IpScope>
-#            <IsInherited>true</IsInherited>
-#            <Gateway>10.192.0.1</Gateway>
-#            <Netmask>255.255.252.0</Netmask>
-#            <Dns1>10.192.0.11</Dns1>
-#            <Dns2>10.192.0.12</Dns2>
-#            <DnsSuffix>dev.ad.mdsol.com</DnsSuffix>
-#            <IpRanges>
-#                <IpRange>
-#                    <StartAddress>10.192.0.100</StartAddress>
-#                    <EndAddress>10.192.3.254</EndAddress>
-#                </IpRange>
-#            </IpRanges>
-#        </IpScope>
-#        <FenceMode>bridged</FenceMode>
-#        <RetainNetInfoAcrossDeployments>false</RetainNetInfoAcrossDeployments>
-#    </Configuration>
-#</OrgNetwork>
-#
 module Fog
   module Parsers
     module Compute
       module VcloudDirector
-
+        #
+        #{:xmlns=>"http://www.vmware.com/vcloud/v1.5",
+        # :xmlns_xsi=>"http://www.w3.org/2001/XMLSchema-instance",
+        # :name=>"DevOps - Dev Network Connection",
+        # :id=>"urn:vcloud:network:d5f47bbf-de27-4cf5-aaaa-56772f2ccd17",
+        # :type=>"application/vnd.vmware.vcloud.orgNetwork+xml",
+        # :href=>
+        #  "https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17",
+        # :xsi_schemaLocation=>
+        #  "http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd",
+        # :Link=>
+        #  [{:rel=>"up",
+        #    :type=>"application/vnd.vmware.vcloud.org+xml",
+        #    :name=>"DevOps",
+        #    :href=>
+        #     "https://example.com/api/org/c6a4c623-c158-41cf-a87a-dbc1637ad55a"},
+        #   {:rel=>"down",
+        #    :type=>"application/vnd.vmware.vcloud.metadata+xml",
+        #    :href=>
+        #     "https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17/metadata"}],
+        # :Description=>"",
+        # :Configuration=>
+        #  {:IpScope=>
+        #    {:IsInherited=>"true",
+        #     :Gateway=>"10.192.0.1",
+        #     :Netmask=>"255.255.252.0",
+        #     :Dns1=>"10.192.0.11",
+        #     :Dns2=>"10.192.0.12",
+        #     :DnsSuffix=>"dev.ad.mdsol.com",
+        #     :IpRanges=>
+        #      {:IpRange=>
+        #        {:StartAddress=>"10.192.0.100", :EndAddress=>"10.192.3.254"}}},
+        #   :FenceMode=>"bridged",
+        #   :RetainNetInfoAcrossDeployments=>"false"}}
+        #
+        #<?xml version="1.0" encoding="UTF-8"?>
+        #<OrgNetwork xmlns="http://www.vmware.com/vcloud/v1.5" name="DevOps - Dev Network Connection" id="urn:vcloud:network:d5f47bbf-de27-4cf5-aaaa-56772f2ccd17" type="application/vnd.vmware.vcloud.orgNetwork+xml" href="https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd">
+        #    <Link rel="up" type="application/vnd.vmware.vcloud.org+xml" name="DevOps" href="https://example.com/api/org/c6a4c623-c158-41cf-a87a-dbc1637ad55a"/>
+        #    <Link rel="down" type="application/vnd.vmware.vcloud.metadata+xml" href="https://example.com/api/network/d5f47bbf-de27-4cf5-aaaa-56772f2ccd17/metadata"/>
+        #    <Description/>
+        #    <Configuration>
+        #        <IpScope>
+        #            <IsInherited>true</IsInherited>
+        #            <Gateway>10.192.0.1</Gateway>
+        #            <Netmask>255.255.252.0</Netmask>
+        #            <Dns1>10.192.0.11</Dns1>
+        #            <Dns2>10.192.0.12</Dns2>
+        #            <DnsSuffix>dev.ad.mdsol.com</DnsSuffix>
+        #            <IpRanges>
+        #                <IpRange>
+        #                    <StartAddress>10.192.0.100</StartAddress>
+        #                    <EndAddress>10.192.3.254</EndAddress>
+        #                </IpRange>
+        #            </IpRanges>
+        #        </IpScope>
+        #        <FenceMode>bridged</FenceMode>
+        #        <RetainNetInfoAcrossDeployments>false</RetainNetInfoAcrossDeployments>
+        #    </Configuration>
+        #</OrgNetwork>
+        #
         class VmNetwork < VcloudDirectorParser
 
           def reset
@@ -104,7 +103,6 @@ module Fog
           end
 
         end
-
       end
     end
   end

data/lib/fog/vcloud_director/requests/compute/delete_catalog_item.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+        # Delete a catalog item.
+        #
+        # @param [String] id Object identifier of the catalog item.
+        # @return [Excon::Response]
+        #
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/DELETE-CatalogItem.html
+        # @since vCloud API version 0.9
+        def delete_catalog_item(id)
+          request(
+            :expects => 204,
+            :method  => 'DELETE',
+            :path    => "catalogItem/#{id}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud_director/requests/compute/delete_catalog_item_metadata_item_metadata.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+        # Delete the specified key and its value from catalog item metadata.
+        #
+        # @param [String] id Object identifier of the catalog item.
+        # @param [String] key Key of the metadata item.
+        # @return [Excon::Response]
+        #   * body<~Hash>:
+        #
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/DELETE-CatalogItemMetadataItem-metadata.html
+        # @since vCloud API version 1.5
+        def delete_catalog_item_metadata_item_metadata(id, key)
+          request(
+            :expects => 202,
+            :method  => 'DELETE',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "catalogItem/#{id}/metadata/#{URI.escape(key)}"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud_director/requests/compute/delete_disk.rb

@@ -0,0 +1,60 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+        # Delete a disk.
+        #
+        # This operation is asynchronous and returns a task that you can
+        # monitor to track the progress of the request.
+        #
+        # @param [String] id Object identifier of the disk.
+        # @return [Excon::Response]
+        #   * body<~Hash>:
+        #
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/DELETE-Disk.html
+        # @since vCloud API version 5.1
+        def delete_disk(id)
+          request(
+            :expects => 202,
+            :method  => 'DELETE',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "disk/#{id}"
+          )
+        end
+      end
+
+      class Mock
+        def delete_disk(id)
+          unless data[:disks][id]
+            raise Fog::Compute::VcloudDirector::Forbidden.new(
+              "No access to entity \"(com.vmware.vcloud.entity.disk:#{id})\""
+            )
+          end
+
+          owner = {
+            :href => make_href("disk/#{id}"),
+            :type => 'application/vnd.vmware.vcloud.disk+xml'
+          }
+          task_id = enqueue_task(
+            "Deleting Disk(#{id})", 'vdcDeleteDisk', owner,
+            :on_success => lambda do
+              data[:disks].delete(id)
+            end
+          )
+
+          body = {
+            :xmlns => xmlns,
+            :xmlns_xsi => xmlns_xsi,
+            :xsi_schemaLocation => xsi_schema_location,
+          }.merge(task_body(task_id))
+
+          Excon::Response.new(
+            :status => 202,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud_director/requests/compute/delete_disk_metadata_item_metadata.rb

@@ -0,0 +1,25 @@
+module Fog
+  module Compute
+    class VcloudDirector
+      class Real
+        # Delete the specified key and its value from disk metadata.
+        #
+        # @param [String] id Object identifier of the disk.
+        # @param [String] key Key of the metadata item.
+        # @return [Excon::Response]
+        #   * body<~Hash>:
+        #
+        # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/DELETE-DiskMetadataItem-metadata.html
+        # @since vCloud API version 5.1
+        def delete_disk_metadata_item_metadata(id, key)
+          request(
+            :expects => 202,
+            :method  => 'DELETE',
+            :parser  => Fog::ToHashDocument.new,
+            :path    => "disk/#{id}/metadata/#{URI.escape(key)}"
+          )
+        end
+      end
+    end
+  end
+end