fog-vcloud-director 0.1.10 → 0.3.1

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Install VMware Tools on a running VM.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Create a vApp from a vApp template.
         #
@@ -45,7 +45,7 @@ module Fog
         # @return [Excon::Response]
         #   * body<~Hash>:
         #
-        # @raise Fog::Compute::VcloudDirector::DuplicateName
+        # @raise Fog::VcloudDirector::Compute::DuplicateName
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-InstantiateVAppTemplate.html
         # @since vCloud API version 0.9
@@ -120,9 +120,9 @@ module Fog
               :parser  => Fog::ToHashDocument.new,
               :path    => "vdc/#{id}/action/instantiateVAppTemplate"
             )
-          rescue Fog::Compute::VcloudDirector::BadRequest => e
+          rescue Fog::VcloudDirector::Compute::BadRequest => e
             if e.minor_error_code == 'DUPLICATE_NAME'
-              raise Fog::Compute::VcloudDirector::DuplicateName.new(e.message)
+              raise Fog::VcloudDirector::Compute::DuplicateName.new(e.message)
             end
             raise
           end
@@ -133,7 +133,7 @@ module Fog
 
         def post_instantiate_vapp_template(vdc_id, vapp_template_id, name, options={})
           unless data[:vdcs][vdc_id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               "No access to entity \"(com.vmware.vcloud.entity.vdc:#{vdc_id})\"."
             )
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Log in and create a Session object.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         extend Fog::Deprecation
         deprecate :post_vm_poweroff, :post_power_off_vapp
@@ -18,7 +18,7 @@ module Fog
         # @return [Excon::Response]
         #   * body<~Hash>:
         #
-        # @raise [Fog::Compute::VcloudDirector::BadRequest]
+        # @raise [Fog::VcloudDirector::Compute::BadRequest]
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-PowerOffVApp.html
         # @since vCloud API version 0.9

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         extend Fog::Deprecation
         deprecate :post_vm_poweron, :post_power_on_vapp
@@ -18,7 +18,7 @@ module Fog
         # @return [Excon::Response]
         #   * body<~Hash>:
         #
-        # @raise [Fog::Compute::VcloudDirector::BadRequest]
+        # @raise [Fog::VcloudDirector::Compute::BadRequest]
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-PowerOnVApp.html
         # @since vCloud API version 0.9
@@ -33,8 +33,8 @@ module Fog
       end
       class Mock
         def post_power_on_vapp(id)
-          unless vapp = data[:vapps][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+          unless data[:vapps][id]
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'This operation is denied.'
             )
           end
@@ -65,7 +65,7 @@ module Fog
             :body => body
           )
         end
-        end
+      end
     end
   end
 end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Reboot a vApp or VM.
         #
@@ -15,7 +15,7 @@ module Fog
         # @return [Excon::Response]
         #   * body<~Hash>:
         #
-        # @raise [Fog::Compute::VcloudDirector::BadRequest]
+        # @raise [Fog::VcloudDirector::Compute::BadRequest]
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-RebootVApp.html
         # @since vCloud API version 0.9

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

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         require 'fog/vcloud_director/generators/compute/recompose_vapp'
         def post_recompose_vapp(id, options={})
-          body = Fog::Generators::Compute::VcloudDirector::RecomposeVapp.new(options).generate_xml
+          body = Fog::VcloudDirector::Generators::Compute::RecomposeVapp.new(options).generate_xml
 
           request(
             :body => body,

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

@@ -1,8 +1,9 @@
+require 'fog/vcloud_director/generators/compute/reconfigure_vm'
+
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
-        
         # Updates VM configuration.
         #
         # This operation is asynchronous and returns a task that you can
@@ -13,8 +14,6 @@ module Fog
         #
         # @option options [String] :name Change the VM's name [required].
         # @option options [String] :description VM description
-        # @option options [Integer] :cpu Number of CPUs
-        # @option options [Integer] :memory Memory in MB
         #
         # @return [Excon::Response]
         #   * body<~Hash>:
@@ -23,23 +22,9 @@ module Fog
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-ReconfigureVm.html
         # @since vCloud API version 5.1
-        def post_reconfigure_vm(id, options={})
-          
-          body = Nokogiri::XML::Builder.new do |xml|
-            attrs = {
-              :xmlns => 'http://www.vmware.com/vcloud/v1.5',
-              'xmlns:ovf' => 'http://schemas.dmtf.org/ovf/envelope/1',
-              'xmlns:rasd' => 'http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData',
-              :name => options[:name]
-            }
-            xml.Vm(attrs) do
-              xml.Description options[:description] if options[:description]
-              virtual_hardware_section(xml, options)
-            end
-          end.to_xml
-          
+        def post_reconfigure_vm(id, current, options)
           request(
-            :body    => body,
+            :body    => Fog::VcloudDirector::Generators::Compute::ReconfigureVm.generate_xml(current, options),
             :expects => 202,
             :headers => {'Content-Type' => 'application/vnd.vmware.vcloud.vm+xml'},
             :method  => 'POST',
@@ -47,71 +32,6 @@ module Fog
             :path    => "vApp/#{id}/action/reconfigureVm"
           )
         end
-        
-        private
-        
-        def virtual_hardware_section(xml, options)
-          return unless options[:cpu] or options[:memory]
-          xml['ovf'].VirtualHardwareSection do
-            xml['ovf'].Info 'Virtual Hardware Requirements'
-            cpu_section(xml, options[:cpu]) if options[:cpu]
-            memory_section(xml, options[:memory]) if options[:memory]
-          end
-        end
-        
-        def cpu_section(xml, cpu)
-          xml['ovf'].Item do
-            xml['rasd'].AllocationUnits 'hertz * 10 ^ 6'
-            xml['rasd'].InstanceID 5
-            xml['rasd'].ResourceType 3
-            xml['rasd'].VirtualQuantity cpu.to_i
-          end
-        end
-        
-        def memory_section(xml, memory)
-          xml['ovf'].Item do
-            xml['rasd'].AllocationUnits 'byte * 2^20'
-            xml['rasd'].InstanceID 6
-            xml['rasd'].ResourceType 4
-            xml['rasd'].VirtualQuantity memory.to_i
-          end
-        end
-        
-      end
-      
-      class Mock
-        def post_reconfigure_vm(id, options={})
-          unless vm = data[:vms][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
-              'This operation is denied.'
-            )
-          end
-          
-          owner = {
-            :href => make_href("vApp/#{id}"),
-            :type => 'application/vnd.vmware.vcloud.vApp+xml'
-          }
-          task_id = enqueue_task(
-            "Updating Virtual Machine #{data[:vms][id][:name]}(#{id})", 'vappUpdateVm', owner,
-            :on_success => lambda do
-              data[:vms][id][:name] = options[:name]
-              data[:vms][id][:description] = options[:description] if options[:description]
-              data[:vms][id][:cpu_count] = options[:cpu] if options[:cpu]
-              data[:vms][id][:memory_in_mb] = options[:memory] if options[:memory]
-            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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Removes all user created snapshots for a vApp or virtual machine.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Reset a vApp or VM.
         #
@@ -15,7 +15,7 @@ module Fog
         # @return [Excon::Response]
         #   * body<~Hash>:
         #
-        # @raise [Fog::Compute::VcloudDirector::BadRequest]
+        # @raise [Fog::VcloudDirector::Compute::BadRequest]
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-ResetVApp.html
         # @since vCloud API version 0.9

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Reverts a vApp or virtual machine to the current snapshot, if any.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Shut down a vApp or VM.
         #
@@ -15,7 +15,7 @@ module Fog
         # @return [Excon::Response]
         #   * body<~Hash>:
         #
-        # @raise [Fog::Compute::VcloudDirector::BadRequest]
+        # @raise [Fog::VcloudDirector::Compute::BadRequest]
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-ShutdownVApp.html
         # @since vCloud API version 0.9

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Suspend a vApp or VM.
         #
@@ -15,7 +15,7 @@ module Fog
         # @return [Excon::Response]
         #   * body<~Hash>:
         #
-        # @raise [Fog::Compute::VcloudDirector::BadRequest]
+        # @raise [Fog::VcloudDirector::Compute::BadRequest]
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-SuspendVApp.html
         # @since vCloud API version 0.9

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Undeploy a vApp/VM.
         #
@@ -29,7 +29,7 @@ module Fog
         # @return [Excon::Response]
         #   * body<~Hash>:
         #
-        # @raise [Fog::Compute::VcloudDirector::BadRequest]
+        # @raise [Fog::VcloudDirector::Compute::BadRequest]
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-UndeployVApp.html
         # @since vCloud API version 0.9

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Merge the metadata provided in the request with existing catalog item metadata.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Merge the metadata provided in the request with existing metadata.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Merge the metadata provided in the request with existing metadata.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Merge the metadata provided in the request with existing metadata.
         #
@@ -49,8 +49,8 @@ module Fog
       end
       class Mock
         def post_update_vapp_metadata(id, metadata={})
-          unless vm = data[:vms][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+          unless data[:vms][id]
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'This operation is denied.'
             )
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Merge the metadata provided in the request with existing metadata.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Upgrade the virtual hardware version of a VM to the highest supported
         # virtual hardware version of the vDC that contains it.

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Create a disk.
         #
@@ -81,12 +81,12 @@ module Fog
       class Mock
         def post_upload_disk(id, name, size, options={})
           unless size.to_s =~ /^\d+$/
-            raise Fog::Compute::VcloudDirector::BadRequest.new(
+            raise Fog::VcloudDirector::Compute::BadRequest.new(
               "validation error on field 'diskSpec.sizeBytes': must be greater than or equal to 0"
             )
           end
           unless data[:vdcs][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'No access to entity "(com.vmware.vcloud.entity.vdc:%s)".' % id
             )
           end