fog-vcloud-director 0.1.10 → 0.3.1

data/lib/fog/vcloud_director/requests/compute/get_vms_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 VMs in lease by using REST API general
         # QueryHandler.
@@ -71,7 +71,7 @@ module Fog
             :method     => 'GET',
             :parser     => Fog::ToHashDocument.new,
             :path       => 'vms/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/instantiate_vapp_template.rb

@@ -1,8 +1,8 @@
 require 'builder'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         require 'fog/vcloud_director/generators/compute/instantiate_vapp_template_params'
         # Create a vApp from a vApp template.
@@ -69,7 +69,7 @@ module Fog
           options[:Source] = options.delete(:template_uri) if options[:template_uri]
           options[:source_vms].each_with_index { |_, i| options[:source_vms][i][:href] = vapp_template_vm_end_point(options[:source_vms][i].delete(:vm_id)) if options[:source_vms][i].has_key?(:vm_id) }
 
-          Fog::Generators::Compute::VcloudDirector::InstantiateVappTemplateParams.new(options).generate_xml
+          Fog::VcloudDirector::Generators::Compute::InstantiateVappTemplateParams.new(options).generate_xml
         end
 
         def xmlns
@@ -106,12 +106,12 @@ module Fog
         # Assume the template is a single VM with one network interface and one disk.
         def instantiate_vapp_template(vapp_name, template_id, options={})          
           unless data[:catalog_items].values.find {|i| i[:template_id] == template_id}
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'No such template.'
             )
           end
-          unless vdc = data[:vdcs][options[:vdc_id]]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+          unless data[:vdcs][options[:vdc_id]]
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'No such VDC.'
             )
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve a MKS screen ticket that you can use
         # to gain access to the console of a running VM.
@@ -9,7 +9,7 @@ module Fog
         # @return [Excon::Response]
         #   * body<~Hash>:
         #
-        # @raise [Fog::Compute::VcloudDirector::Conflict]
+        # @raise [Fog::VcloudDirector::Compute::Conflict]
         #
         # https://pubs.vmware.com/vcd-80/index.jsp?topic=%2Fcom.vmware.vcloud.api.reference.doc_90%2Fdoc%2Foperations%2FPOST-AcquireMksTicket.html
         # @since vCloud API version 5.5

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve a screen ticket that you can use with the VMRC browser
         # plug-in to gain access to the console of a running VM.
@@ -9,7 +9,7 @@ module Fog
         # @return [Excon::Response]
         #   * body<~Hash>:
         #
-        # @raise [Fog::Compute::VcloudDirector::Conflict]
+        # @raise [Fog::VcloudDirector::Compute::Conflict]
         #
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-AcquireTicket.html
         # @since vCloud API version 0.9

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Attach a disk to a VM.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         extend Fog::Deprecation
         deprecate :post_task_cancel, :post_cancel_task
@@ -24,7 +24,7 @@ module Fog
       class Mock
         def post_cancel_task(id)
           unless task = data[:tasks][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               'No access to entity "com.vmware.vcloud.entity.task:%s"' % id
             )
           end

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Perform storage profile compliance check on a VM.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Create a copy of a media object.
         #
@@ -53,12 +53,12 @@ module Fog
         def post_clone_media(vdc_id, source_id, options={})
           # TODO: check this happens.
           unless source_media = data[:medias][source_id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               "No access to entity \"(com.vmware.vcloud.entity.media:#{source_id})\"."
             )
           end
           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_clone_vapp.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Create a copy of a vApp.
         #

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         require 'fog/vcloud_director/generators/compute/compose_vapp'
         # Compose a vApp from existing virtual machines.
@@ -28,7 +28,7 @@ module Fog
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-ComposeVApp.html
         # @since vCloud API version 0.9
         def post_compose_vapp(id, options={})
-          body = Fog::Generators::Compute::VcloudDirector::ComposeVapp.new(options).generate_xml
+          body = Fog::VcloudDirector::Generators::Compute::ComposeVapp.new(options).generate_xml
 
           request(
             :body => body,

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         require 'fog/vcloud_director/generators/compute/edge_gateway_service_configuration'
 
@@ -20,7 +20,7 @@ module Fog
         #   vCloud API Documentaion
         # @since vCloud API version 5.1
         def post_configure_edge_gateway_services(id, configuration)
-          body = Fog::Generators::Compute::VcloudDirector::EdgeGatewayServiceConfiguration.new(configuration).generate_xml
+          body = Fog::VcloudDirector::Generators::Compute::EdgeGatewayServiceConfiguration.new(configuration).generate_xml
 
           request(
               :body => body,
@@ -36,7 +36,7 @@ module Fog
       class Mock
         def post_configure_edge_gateway_services(id, configuration)
           unless data[:edge_gateways][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
                       "No access to entity \"(com.vmware.vcloud.entity.edgegateway:#{id})\"."
                   )
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Consolidate VM snapshots.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Consolidate VM snapshots.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Add an item to a catalog.
         #
@@ -15,7 +15,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-CreateCatalogItem.html
         # @since vCloud API version 0.9
@@ -43,9 +43,9 @@ module Fog
               :parser  => Fog::ToHashDocument.new,
               :path    => "catalog/#{id}/catalogItems"
             )
-          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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         require 'fog/vcloud_director/generators/compute/org_vdc_network'
 
@@ -51,7 +51,7 @@ module Fog
         # @see http://pubs.vmware.com/vcd-51/topic/com.vmware.vcloud.api.reference.doc_51/doc/operations/POST-CreateOrgVdcNetwork.html
         # @since vCloud API version 5.1
         def post_create_org_vdc_network(vdc_id, name, options={})
-          body = Fog::Generators::Compute::VcloudDirector::OrgVdcNetwork.new(options.merge(:name => name)).generate_xml
+          body = Fog::VcloudDirector::Generators::Compute::OrgVdcNetwork.new(options.merge(:name => name)).generate_xml
 
           request(
             :body    => body,
@@ -67,7 +67,7 @@ module Fog
       class Mock
         def post_create_org_vdc_network(vdc_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_create_snapshot.rb

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Deploy a vApp or VM.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Detach a disk from a VM.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Hide hardware-assisted CPU virtualization from guest OS.
         #

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Discard suspended state of a vApp or VM.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Eject virtual media.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Expose hardware-assisted CPU virtualization to guest OS.
         #

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Place the vApp in maintenance mode.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Take the vApp out of maintenance mode.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Insert virtual media.
         #