fog-vcloud-director 0.1.10 → 0.3.1

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

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         class VmCustomization < VcloudDirectorParser
           def reset
             @response = { }

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

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         #
         #{:xmlns=>"http://www.vmware.com/vcloud/v1.5",
         # :xmlns_xsi=>"http://www.w3.org/2001/XMLSchema-instance",

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

@@ -1,8 +1,17 @@
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         module VmParserHelper
+          def initialize_vm
+            {
+              :vapp_id        => nil,
+              :ip_address     => '',
+              :description    => '',
+              :cpu_hot_add    => nil,
+              :memory_hot_add => nil
+            }
+          end
 
           def parse_end_element(name, vm)
             case name
@@ -39,6 +48,12 @@ module Fog
               }
             when 'Link'
               vm[:links] = @links
+            when 'CoresPerSocket'
+              vm[:cores_per_socket] = value
+            when 'CpuHotAddEnabled'
+              vm[:cpu_hot_add] = value == 'true'
+            when 'MemoryHotAddEnabled'
+              vm[:memory_hot_add] = value == 'true'
             end
           end
 
@@ -46,15 +61,52 @@ module Fog
             case name
             when 'OperatingSystemSection'
               @in_operating_system = true
+
+              # VirtualHardwareSection was parsed if we're here. Set missing values to defaults since
+              # repeatable parsing won't get them.
+              vm[:cores_per_socket] ||= 1
+              vm[:disks]            ||= []
+              vm[:network_adapters] ||= []
             when 'HostResource'
               @current_host_resource = extract_attributes(attributes)
             when 'Connection'
               @current_network_connection = extract_attributes(attributes)
             when 'Link'
+              # Parse vapp id from any link if not found elsewhere.
+              vm[:vapp_id] ||= id_from_url(attr_value('href', attributes), :id_prefix => 'vapp-')
+
               @links << extract_attributes(attributes)
             end
           end
 
+          def parse_vm_attributes(attributes, vm)
+            vm_attrs = extract_attributes(attributes)
+            vm.merge!(vm_attrs.select { |key, _| %i(href name status type deployed).include?(key) })
+            vm[:id]       = vm[:href].split('/').last
+            vm[:status]   = human_status(vm[:status])
+            vm[:deployed] = vm[:deployed] == 'true'
+          end
+
+          def human_status(status)
+            case status
+            when '-1', -1
+              'failed_creation'
+            when '0', 0
+              'creating'
+            when '8', 8
+              'off'
+            when '4', 4
+              'on'
+            when '3', 3
+              'suspended'
+            else
+              'unknown'
+            end
+          end
+
+          def id_from_url(url, id_prefix: 'vapp-')
+            url.split('/').detect { |part| part.start_with?(id_prefix) }
+          end
         end
       end
     end

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

@@ -1,14 +1,14 @@
 require 'fog/vcloud_director/parsers/compute/vm_parser_helper'
 
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         class Vms < VcloudDirectorParser
           include VmParserHelper
 
           def reset
-            @vm = { :ip_address => '' }
+            @vm = initialize_vm
             @in_operating_system = false
             @in_children = false
             @resource_type = nil
@@ -20,13 +20,7 @@ module Fog
             super
             case name
             when 'Vm'
-              vapp = extract_attributes(attributes)
-              @vm.merge!(vapp.reject {|key,value| ![:href, :name, :status, :type, :deployed].include?(key)})
-              @vm[:deployed] = response[:deployed] == 'true'
-              @vm[:id] = @vm[:href].split('/').last
-              @vm[:vapp_id] = @response[:id]
-              @vm[:vapp_name] = @response[:name]
-              @vm[:status] = human_status(@vm[:status])
+              parse_vm_attributes(attributes, @vm)
             when 'VApp'
               vapp = extract_attributes(attributes)
               @response.merge!(vapp.reject {|key,value| ![:href, :name, :size, :status, :type].include?(key)})
@@ -48,21 +42,6 @@ module Fog
               end
             end
           end
-
-          def human_status(status)
-            case status
-            when '0', 0
-              'creating'
-            when '8', 8
-              'off'
-            when '4', 4
-              'on'
-            when '3', 3
-              'suspended'
-            else
-              'unknown'
-            end
-          end
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         class VmsByMetadata < VcloudDirectorParser
           def reset
             @response = { :vm_records => [] }

data/lib/fog/vcloud_director/query.rb

@@ -1,4 +1,3 @@
-require 'pp'
 module Fog
   module VcloudDirector
     module Query

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Delete a catalog item.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Delete the specified key and its value from catalog item metadata.
         #
@@ -16,7 +16,7 @@ module Fog
             :expects => 202,
             :method  => 'DELETE',
             :parser  => Fog::ToHashDocument.new,
-            :path    => "catalogItem/#{id}/metadata/#{URI.escape(key)}"
+            :path    => "catalogItem/#{id}/metadata/#{URI::DEFAULT_PARSER.escape(key)}"
           )
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Delete a disk.
         #
@@ -26,7 +26,7 @@ module Fog
       class Mock
         def delete_disk(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:#{id})\""
             )
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Delete the specified key and its value from disk metadata.
         #
@@ -16,7 +16,7 @@ module Fog
             :expects => 202,
             :method  => 'DELETE',
             :parser  => Fog::ToHashDocument.new,
-            :path    => "disk/#{id}/metadata/#{URI.escape(key)}"
+            :path    => "disk/#{id}/metadata/#{URI::DEFAULT_PARSER.escape(key)}"
           )
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # @return [Excon::Response]
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Delete a media object.
         #
@@ -72,7 +72,7 @@ module Fog
         #         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/DELETE-Media.html
         # @since vCloud API version 0.9
@@ -89,7 +89,7 @@ module Fog
       class Mock
         def delete_media(id)
           unless media = data[:medias][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               "No access to entity \"(com.vmware.vcloud.entity.media:#{id})\""
             )
           end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Delete the specified key and its value from media object metadata.
         #
@@ -16,7 +16,7 @@ module Fog
             :expects => 202,
             :method  => 'DELETE',
             :parser  => Fog::ToHashDocument.new,
-            :path    => "media/#{id}/metadata/#{URI.escape(key)}"
+            :path    => "media/#{id}/metadata/#{URI::DEFAULT_PARSER.escape(key)}"
           )
         end
       end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Delete an OrgVdcNetwork
         #
@@ -11,7 +11,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/DELETE-Network.html
         # @since vCloud API version 0.9
@@ -28,7 +28,7 @@ module Fog
       class Mock
         def delete_network(id)
           unless data[:networks][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               "No access to entity \"(com.vmware.vcloud.entity.orgVdcNetwork:#{id})\""
             )
           end

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Delete a vApp or VM.
         #
@@ -11,7 +11,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/DELETE-VApp.html
         # @since vCloud API version 0.9
@@ -26,8 +26,8 @@ module Fog
       end
       class Mock
         def delete_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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         extend Fog::Deprecation
         deprecate :delete_metadata, :delete_vapp_metadata_item_metadata
@@ -21,7 +21,7 @@ module Fog
             :expects => 202,
             :method  => 'DELETE',
             :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/delete_vapp_template.rb

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Delete the specified key and its value from vApp template or VM
         # metadata.
@@ -17,7 +17,7 @@ module Fog
             :expects => 202,
             :method  => 'DELETE',
             :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_allocated_ip_addresses.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve a list of IP addresses allocated to the network.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Real
         # Retrieve a catalog.
         #
@@ -8,7 +8,7 @@ module Fog
         # @return [Excon::Response]
         #   * hash<~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-Catalog.html
         # @since vCloud API version 0.9
@@ -28,7 +28,7 @@ module Fog
       class Mock
         def get_catalog(id)
           unless catalog = data[:catalogs][id]
-            raise Fog::Compute::VcloudDirector::Forbidden.new(
+            raise Fog::VcloudDirector::Compute::Forbidden.new(
               "No access to entity \"(com.vmware.vcloud.entity.catalog:#{id})\"."
             )
           end