fog-vcloud-director 0.1.10 → 0.3.1

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve a list of ProductSection elements from a vApp template or
         # VM.

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # This is used for manual testing.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve the runtime info section of a VM.
         #
@@ -27,7 +27,7 @@ module Fog
           type = 'application/vnd.vmware.vcloud.virtualHardwareSection+xml'
 
           unless vm = data[:vms][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'This operation is denied.'
             )
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve all RASD items that specify serial port properties of a VM.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve a shadow VM.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve SnapshotSection element for a vApp or VM.
         #
@@ -27,7 +27,7 @@ module Fog
           type = 'application/vnd.vmware.vcloud.snapshotSection+xml'
 
           unless data[:vms][id] || data[:vapps][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'This operation is denied.'
             )
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve the startup section of a vApp.
         #
@@ -28,7 +28,7 @@ module Fog
           type = 'application/vnd.vmware.vcloud.startupSection+xml'
 
           unless vapp = data[:vapps][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'This operation is denied.'
             )
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # List operating systems available for use on virtual machines owned by
         # this organization.

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # List all supported versions.
         #

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

@@ -1,8 +1,8 @@
 require 'date'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve a task.
         #
@@ -70,7 +70,7 @@ module Fog
         #     * :Details<~String> - Detailed message about the task. Also
         #       contained by the :Owner entity when task status is preRunning.
         #
-        # @raise [Fog::Compute::VcloudDirector::Forbidden]
+        # @raise [Fog::VcloudDirector::Compute::Forbidden]
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/GET-Task.html
         # @since vCloud API version 0.9
@@ -97,7 +97,7 @@ module Fog
       class Mock
         def get_task(id)
           unless data[:tasks][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'This operation is denied.'
             )
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         extend Fog::Deprecation
         deprecate :get_tasks_list, :get_task_list
@@ -82,8 +82,8 @@ module Fog
         #         contained by the :Owner entity when task status is
         #         preRunning.
         #
-        # @raise [Fog::Compute::VcloudDirector::BadRequest]
-        # @raise [Fog::Compute::VcloudDirector::Forbidden]
+        # @raise [Fog::VcloudDirector::Compute::BadRequest]
+        # @raise [Fog::VcloudDirector::Compute::Forbidden]
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/GET-TaskList.html
         # @since vCloud API version 0.9
@@ -103,7 +103,7 @@ module Fog
       class Mock
         def get_task_list(id)
           unless id == data[:org][:uuid]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               "No access to entity \"com.vmware.vcloud.entity.org:#{id}\"."
             )
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         require 'fog/vcloud_director/parsers/compute/vm'
 
@@ -13,62 +13,16 @@ module Fog
         #   * body<~Hash>:
         #
         # @see #get_vapp
-        def get_vm(id)
+        def get_template_vm(id)
           request(
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Compute::VcloudDirector::Vm.new,
+            :parser     => Fog::VcloudDirector::Parsers::Compute::Vm.new,
             :path       => "vAppTemplate/#{id}"
           )
         end
       end
-      class Mock
-        def get_vm(id)
-          vapp = get_vapp(id).body
-          vm = parse_vapp_to_vm(vapp)
-          body = {:type => vapp[:type], :vm => vm}
-          Excon::Response.new(
-            :status => 200,
-            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
-            :body => body
-          )
-        end
-        
-        # Mock equivalent of Fog::Parsers::Compute::VcloudDirector::Vm
-        def parse_vapp_to_vm(vapp)
-          parser = Fog::Parsers::Compute::VcloudDirector::Vm.new
-          vm = vapp.select {|k| [:href, :name, :status, :type].include? k}
-          network = vapp[:NetworkConnectionSection]
-          vm.merge({
-            :id => vapp[:href].split('/').last,
-            :status => parser.human_status(vapp[:status]),
-            :ip_address => network[:NetworkConnection][:IpAddress],
-            :description => vapp[:Description],
-            :cpu => get_hardware(vapp, 3),
-            :memory => get_hardware(vapp, 4),
-            :disks => get_disks(vapp),
-            :links => [vapp[:GuestCustomizationSection][:Link]],
-          })
-        end
-        
-        def get_hardware(vapp, resource_type)
-          hardware = vapp[:"ovf:VirtualHardwareSection"][:"ovf:Item"]
-          item = hardware.find {|h| h[:"rasd:ResourceType"].to_i == resource_type}
-          if item and item.key? :"rasd:VirtualQuantity"
-            item[:"rasd:VirtualQuantity"].to_i
-          else
-            nil
-          end
-        end
-        
-        def get_disks(vapp)
-          hardware = vapp[:"ovf:VirtualHardwareSection"][:"ovf:Item"]
-          disks = hardware.select {|h| h[:"rasd:ResourceType"].to_i == 17}
-          disks.map {|d| {d[:"rasd:ElementName"] => d[:"rasd:HostResource"][:ns12_capacity].to_i}}
-        end
-        
-      end
     end
   end
 end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         require 'fog/vcloud_director/parsers/compute/vms'
 
@@ -18,24 +18,11 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Compute::VcloudDirector::Vms.new,
+            :parser     => Fog::VcloudDirector::Parsers::Compute::Vms.new,
             :path       => "vAppTemplate/#{id}"
           )
         end
       end
-      class Mock
-        def get_vms(id)
-          vapptemplate = get_vapp(id).body
-          parser = Fog::Parsers::Compute::VcloudDirector::Vms.new
-          vms  = vapp[:Children][:Vm].map {|child| parse_vapp_to_vm(child) }
-          body = {:type => vapp[:type], :vms => vms}
-          Excon::Response.new(
-            :status => 200,
-            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
-            :body => body
-          )
-        end
-      end
     end
   end
 end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieves a thumbnail image of a VM console.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieves a list of users for organization the org admin belongs to
         # by using REST API general QueryHandler.
@@ -71,7 +71,7 @@ module Fog
             :method     => 'GET',
             :parser     => Fog::ToHashDocument.new,
             :path       => 'admin/users/query',
-            :query      => query.map {|q| URI.escape(q)}.join('&')
+            :query      => query.map {|q| URI::DEFAULT_PARSER.escape(q)}.join('&')
           )
           ensure_list! response.body, :Link
           ensure_list! response.body,

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

@@ -1,24 +1,25 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve a vApp or VM.
         #
         # @param [String] id Object identifier of the vApp or VM.
+        # @param [Class or Symbol] parser, see compute.rb#request() documentation for details.
         # @return [Excon::Response]
         #   * body<~Hash>:
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/GET-VApp.html
         # @since vCloud API version 0.9
-        def get_vapp(id)
+        def get_vapp(id, parser: Fog::VcloudDirector::Parsers::Compute::Vapp)
           response = request(
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::ToHashDocument.new,
+            :parser     => parser,
             :path       => "vApp/#{id}"
           )
-          ensure_list! response.body, :Children, :Vm
+          ensure_list!(response.body, :Children, :Vm) if parser == Fog::ToHashDocument
           response
         end
       end
@@ -36,7 +37,7 @@ module Fog
           when /^vm-/
             body = get_mock_vm_body(id)
           else
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'This operation is denied.'
             )
           end
@@ -51,7 +52,7 @@ module Fog
 
         def get_mock_vm_body(id)
           unless vm = data[:vms][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'This operation is denied.'
             )
           end
@@ -82,7 +83,7 @@ module Fog
         def get_mock_vapp_body(id)
 
           unless vapp = data[:vapps][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'This operation is denied.'
             )
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve metadata associated with the vApp or VM.
         #
@@ -27,7 +27,7 @@ module Fog
 
         def get_vapp_metadata(id)
           unless vm_or_vapp = data[:vapps][id] || vm_or_vapp = data[:vms][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'This operation is denied.'
             )
           end
@@ -60,7 +60,7 @@ module Fog
         def get_metadata_entries(metadata, id)
           metadata_entries = []
 
-          for key, value in metadata do
+          for key, _ in metadata do
           metadata_entries << {:type=>"application/vnd.vmware.vcloud.metadata.value+xml",
               :href=>make_href("vApp/#{id}/metadata/#{key}"),
               :Link=>

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve the value of the specified key from vApp or VM metadata.
         #
@@ -17,7 +17,7 @@ module Fog
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::ToHashDocument.new,
-            :path       => "vApp/#{id}/metadata/#{URI.escape(key)})"
+            :path       => "vApp/#{id}/metadata/#{URI::DEFAULT_PARSER.escape(key)})"
           )
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve the OVF descriptor of a vApp directly.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve the owner of a vApp.
         #
@@ -26,8 +26,8 @@ module Fog
 
           type = 'application/vnd.vmware.vcloud.owner+xml'
 
-          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