fog-vcloud-director 0.1.10 → 0.2.0

data/lib/fog/vcloud_director/models/compute/vapp_templates.rb

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/vcloud_director/models/compute/vapp'
 
 module Fog

data/lib/fog/vcloud_director/models/compute/vapps.rb

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/vcloud_director/models/compute/vapp'
 
 module Fog

data/lib/fog/vcloud_director/models/compute/vdc.rb

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module Compute
     class VcloudDirector

data/lib/fog/vcloud_director/models/compute/vdcs.rb

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/vcloud_director/models/compute/vdc'
 
 module Fog

data/lib/fog/vcloud_director/models/compute/vm.rb

@@ -1,4 +1,3 @@
-require 'fog/core/model'
 require 'fog/vcloud_director/models/compute/vm_customization'
 
 module Fog
@@ -8,7 +7,6 @@ module Fog
         identity  :id
 
         attribute :vapp_id
-        attribute :vapp_name
         attribute :name
         attribute :type
         attribute :description
@@ -18,7 +16,10 @@ module Fog
         attribute :operating_system
         attribute :ip_address
         attribute :cpu, :type => :integer
+        attribute :cores_per_socket, :type => :integer
+        attribute :cpu_hot_add, :type => :boolean
         attribute :memory, :type => :integer
+        attribute :memory_hot_add, :type => :boolean
         attribute :hard_disks, :aliases => :disks
         attribute :network_adapters
 
@@ -148,38 +149,17 @@ module Fog
           requires :id
           service.disks(:vm => self)
         end
-
-        def memory=(new_memory)
-          has_changed = ( memory != new_memory.to_i )
-          not_first_set = !memory.nil?
-          attributes[:memory] = new_memory.to_i
-          if not_first_set && has_changed
-            response = service.put_memory(id, memory)
-            service.process_task(response.body)
-          end
-        end
-
-        def cpu=(new_cpu)
-          has_changed = ( cpu != new_cpu.to_i )
-          not_first_set = !cpu.nil?
-          attributes[:cpu] = new_cpu.to_i
-          if not_first_set && has_changed
-            response = service.put_cpu(id, cpu)
-            service.process_task(response.body)
-          end
-        end
         
         # Reconfigure a VM using any of the options documented in
         # post_reconfigure_vm
-        def reconfigure(options)
-          options[:name] ||= name # name has to be sent
-          # Delete those things that are not changing for performance
-          [:cpu, :memory, :description].each do |k|
-            options.delete(k) if options.key? k and options[k] == attributes[k]
-          end
-          response = service.post_reconfigure_vm(id, options)
+        def reconfigure(options, current: nil)
+          # Fetch current XML.
+          current ||= service.get_vapp(id, :parser => 'xml').body
+          # Let post_reconfigure_vm apply modifications.
+          response = service.post_reconfigure_vm(id, current, options)
           service.process_task(response.body)
-          options.each {|k,v| attributes[k] = v}
+
+          # TODO: apply modifications on current VM instance.
         end
         
         def ready?

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module Compute
     class VcloudDirector

data/lib/fog/vcloud_director/models/compute/vm_customizations.rb

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/vcloud_director/models/compute/vm_customization'
 
 module Fog

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

@@ -1,5 +1,3 @@
-require 'fog/core/model'
-
 module Fog
   module Compute
     class VcloudDirector

data/lib/fog/vcloud_director/models/compute/vm_networks.rb

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/vcloud_director/models/compute/vm_network'
 
 module Fog

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

@@ -1,4 +1,3 @@
-require 'fog/core/collection'
 require 'fog/vcloud_director/models/compute/vm'
 
 module Fog
@@ -36,7 +35,7 @@ module Fog
         end
 
         def item_list
-          data = service.get_vms(vapp.id).body  # vapp.id
+          data = service.get_vapp(vapp.id).body
           items = data[:vms]
           items
         end

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

@@ -0,0 +1,93 @@
+require 'fog/vcloud_director/parsers/compute/vm_parser_helper'
+
+module Fog
+  module Parsers
+    module Compute
+      module VcloudDirector
+        class Vapp < VcloudDirectorParser
+          include VmParserHelper
+
+          def reset
+            @response = @vapp = {
+              :lease_settings  => 'not-implemented',
+              :network_section => 'not-implemented',
+              :network_config  => 'not-implemented'
+            }
+            @in_sections = false
+            @parsing_vm  = false
+          end
+
+          def start_element(name, attributes)
+            super
+            return vm_start_element(name, attributes) if @parsing_vm
+            vapp_start_element(name, attributes)
+          end
+
+          def end_element(name)
+            return vm_end_element(name) if @parsing_vm && name != 'Vm'
+            vapp_end_element(name)
+          end
+
+          private
+
+          def vapp_start_element(name, attributes)
+            case name
+            when 'VApp'
+              vapp_attrs = extract_attributes(attributes)
+              @vapp.merge!(vapp_attrs.reject { |key, _| ![:href, :name, :status, :type, :deployed].include?(key) })
+              @vapp[:id] ||= id_from_url(@vapp[:href], id_prefix: 'vapp-')
+              @vapp[:deployed] = @vapp[:deployed] == 'true'
+            when 'LeaseSettingsSection' # this is the first of the sections
+              @in_sections = true
+              @vapp[:description] ||= '' # if description wasn't parsed by now, then vApp has empty description
+            when 'User'
+              @vapp[:owner] = attr_value('href', attributes).to_s.split('/').last
+            when 'Vm'
+              @parsing_vm = true
+              vm_reset(@vapp[:id])
+              vm_start_element(name, attributes)
+            end
+          end
+
+          def vapp_end_element(name)
+            case name
+            when 'Description'
+              @vapp[:description] = value unless @in_sections
+            when 'InMaintenanceMode'
+              @vapp[:maintenance] = value == 'true'
+            when 'Vm'
+              @parsing_vm = false
+              @vapp[:vms] ||= []
+              @vapp[:vms] << @curr_vm
+            end
+          end
+
+          #
+          # Nested VMs
+          #
+
+          def vm_start_element(name, attributes)
+            return parse_vm_attributes(attributes, @curr_vm) if name == 'Vm'
+            parse_start_element(name, attributes, @curr_vm)
+          end
+
+          def vm_end_element(name)
+            parse_end_element(name, @curr_vm)
+          end
+
+          def vm_reset(vapp_id)
+            @curr_vm                    = initialize_vm
+            @curr_vm[:vapp_id]          = vapp_id
+            @in_operating_system        = false
+            @in_children                = false
+            @resource_type              = nil
+            @links                      = []
+            @element_name               = nil
+            @current_network_connection = nil
+            @current_host_resource      = nil
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -11,77 +11,18 @@ module Fog
             @in_operating_system = false
             @in_children = false
             @resource_type = nil
-            @response = { :vm => { :ip_address => '' } }
+            @response = { :vm => initialize_vm }
             @links = []
           end
 
           def start_element(name, attributes)
             super
-            if name == 'Vm'
-              vm_attrs = extract_attributes(attributes)
-              @response[:vm].merge!(vm_attrs.reject {|key,value| ![:href, :name, :status, :type, :deployed].include?(key)})
-              @response[:vm][:id] = @response[:vm][:href].split('/').last
-              @response[:vm][:status] = human_status(@response[:vm][:status])
-              @response[:vm][:deployed] = @response[:vm][:deployed] == 'true'
-            else
-              parse_start_element name, attributes, @response[:vm]
-            end
+            return parse_vm_attributes(attributes, @response[:vm]) if name == 'Vm'
+            parse_start_element name, attributes, @response[:vm]
           end
 
           def end_element(name)
             parse_end_element name, @response[:vm]
-            case name
-            when 'IpAddress'
-              @response[:vm][:ip_address] = value
-            when 'Description'
-              if @in_operating_system
-                @response[:vm][:operating_system] = value
-                @in_operating_system = false
-              end
-            when 'ResourceType'
-              @resource_type = value
-            when 'VirtualQuantity'
-              case @resource_type
-              when '3'
-                @response[:vm][:cpu] = value
-              when '4'
-                @response[:vm][:memory] = value
-              end
-            when 'ElementName'
-              @element_name = value
-            when 'Item'
-              case @resource_type
-              when '17' # disk
-                @response[:vm][:disks] ||= []
-                @response[:vm][:disks] << { @element_name => @current_host_resource[:capacity].to_i }
-              when '10' # nic
-                @response[:vm][:network_adapters] ||= []
-                @response[:vm][:network_adapters] << {
-                  :ip_address => @current_network_connection[:ipAddress],
-                  :primary => (@current_network_connection[:primaryNetworkConnection] == 'true'),
-                  :ip_allocation_mode => @current_network_connection[:ipAddressingMode]
-                }
-              end
-            when 'Link'
-              @response[:vm][:links] = @links
-            end
-          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
         end
       end

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

@@ -3,6 +3,15 @@ module Fog
     module Compute
       module VcloudDirector
         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,47 @@ module Fog
             case name
             when 'OperatingSystemSection'
               @in_operating_system = true
+              vm[:cores_per_socket] ||= 1 # VirtualHardwareSection was parsed if we're here and if no value was specified, we default to 1
             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

@@ -8,7 +8,7 @@ module Fog
           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/query.rb

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

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

@@ -26,7 +26,7 @@ module Fog
       end
       class Mock
         def delete_vapp(id)
-          unless vapp = data[:vapps][id]
+          unless data[:vapps][id]
             raise Fog::Compute::VcloudDirector::Forbidden.new(
               'This operation is denied.'
             )

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

@@ -27,7 +27,7 @@ module Fog
 
           type = 'application/vnd.vmware.vcloud.leaseSettingsSection+xml'
 
-          unless vapp = data[:vapps][id]
+          unless data[:vapps][id]
             raise Fog::Compute::VcloudDirector::Forbidden.new(
               'This operation is denied.'
             )