fog-vcloud-director 0.1.10 → 0.3.1

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieves the customization section of a vApp template.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve metadata associated with the vApp template or VM.
         #

data/lib/fog/vcloud_director/requests/compute/get_vapp_template_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 template or VM
         # metadata.
@@ -18,7 +18,7 @@ module Fog
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::ToHashDocument.new,
-            :path       => "vAppTemplate/#{id}/metadata/#{URI.escape(key)})"
+            :path       => "vAppTemplate/#{id}/metadata/#{URI::DEFAULT_PARSER.escape(key)})"
           )
         end
       end

data/lib/fog/vcloud_director/requests/compute/get_vapp_template_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 template.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve the owner of a vApp template.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieves a list of vAppTemplates using REST API general
         # QueryHandler.
@@ -71,7 +71,7 @@ module Fog
             :method     => 'GET',
             :parser     => Fog::ToHashDocument.new,
             :path       => 'vAppTemplates/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_vapps_in_lease_from_query.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieves a list of vApps by using REST API general QueryHandler.
         #
@@ -70,7 +70,7 @@ module Fog
             :method     => 'GET',
             :parser     => Fog::ToHashDocument.new,
             :path       => 'vApps/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_vcloud.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve an administrative view of a cloud.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve a vDC.
         #
@@ -8,7 +8,7 @@ module Fog
         # @return [Excon::Response]
         #   * body<~Hash>:
         #
-        # @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-Vdc.html
         # @since vCloud API version 0.9
@@ -32,7 +32,7 @@ module Fog
           response = Excon::Response.new
 
           unless vdc = 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/get_vdc_metadata.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve metadata associated with a vDC.
         #

data/lib/fog/vcloud_director/requests/compute/get_vdc_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 virtual datacenter
         # metadata.
@@ -19,7 +19,7 @@ module Fog
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::ToHashDocument.new,
-            :path       => "admin/vdc/#{id}/metadata/#{URI.escape(key)})"
+            :path       => "admin/vdc/#{id}/metadata/#{URI::DEFAULT_PARSER.escape(key)})"
           )
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         extend Fog::Deprecation
         deprecate :get_vdc_storage_profile, :get_vdc_storage_class
@@ -29,7 +29,7 @@ module Fog
         #       that can specify a storage profile is created with no storage
         #       profile specified.
         #
-        # @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-VdcStorageClass.html
         def get_vdc_storage_class(id)
@@ -46,7 +46,7 @@ module Fog
       class Mock
         def get_vdc_storage_class(id)
           unless vdc_storage_class = data[:vdc_storage_classes][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               "No access to entity \"(com.vmware.vcloud.entity.vdcstorageProfile:#{id})\"."
             )
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         extend Fog::Deprecation
         deprecate :get_vdc_storage_profile_metadata, :get_vdc_storage_class_metadata

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve metadata associated with the vDC storage profile.
         #
@@ -16,7 +16,7 @@ module Fog
             :idempotent => true,
             :method     => 'GET',
             :parser     => Fog::ToHashDocument.new,
-            :path       => "vdcStorageProfile/#{id}/metadata/#{URI.escape(key)})"
+            :path       => "vdcStorageProfile/#{id}/metadata/#{URI::DEFAULT_PARSER.escape(key)})"
           )
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieves a list of vdcs in the organization.
         #
@@ -70,7 +70,7 @@ module Fog
             :method     => 'GET',
             :parser     => Fog::ToHashDocument.new,
             :path       => 'admin/vdcs/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_virtual_hardware_section.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve the virtual hardware section of a VM.
         #

data/lib/fog/vcloud_director/requests/compute/get_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'
 
@@ -18,57 +18,11 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Compute::VcloudDirector::Vm.new,
+            :parser     => Fog::VcloudDirector::Parsers::Compute::Vm.new,
             :path       => "vApp/#{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_vm_capabilities.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Gets capabilities for the VM identified by id.
         #
@@ -33,7 +33,7 @@ module Fog
           type = 'application/vnd.vmware.vcloud.vmCapabilitiesSection+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_vm_compliance_results.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve the results of a compliance check.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         require 'fog/vcloud_director/parsers/compute/vm_customization'
 
@@ -21,7 +21,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Compute::VcloudDirector::VmCustomization.new,
+            :parser     => Fog::VcloudDirector::Parsers::Compute::VmCustomization.new,
             :path       => "vApp/#{id}/guestCustomizationSection"
           )
         end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         require 'fog/vcloud_director/parsers/compute/disks'
 
@@ -21,7 +21,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Compute::VcloudDirector::Disks.new,
+            :parser     => Fog::VcloudDirector::Parsers::Compute::Disks.new,
             :path       => "vApp/#{id}/virtualHardwareSection/disks"
           )
         end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         require 'fog/vcloud_director/parsers/compute/vm_network'
 
@@ -21,7 +21,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Compute::VcloudDirector::VmNetwork.new,
+            :parser     => Fog::VcloudDirector::Parsers::Compute::VmNetwork.new,
             :path       => "vApp/#{id}/networkConnectionSection/"
           )
         end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve a question being asked by a VM.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         require 'fog/vcloud_director/parsers/compute/vms_by_metadata'
 
@@ -10,7 +10,7 @@ module Fog
             :expects    => 200,
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::Compute::VcloudDirector::VmsByMetadata.new,
+            :parser     => Fog::VcloudDirector::Parsers::Compute::VmsByMetadata.new,
             :path       => "vms/query?format=records&filter=metadata:#{key}==STRING:#{value}"
           )
         end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve a list of all VMs attached to a disk.
         #
@@ -26,7 +26,7 @@ module Fog
       class Mock
         def get_vms_disk_attached_to(id)
           unless data[:disks][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'No access to entity "com.vmware.vcloud.entity.disk:%s".' % id
             )
           end