fog-vcloud-director 0.1.10 → 0.3.1

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

@@ -1,8 +1,6 @@
-require 'fog/core/model'
-
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class VappTemplate < Model
         identity  :id
 

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

@@ -1,14 +1,13 @@
-require 'fog/core/collection'
-require 'fog/vcloud_director/models/compute/vapp'
+require 'fog/vcloud_director/models/compute/vapp_template'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class VappTemplates < Collection
 
         include Fog::VcloudDirector::Query
 
-        model Fog::Compute::VcloudDirector::VappTemplate
+        model Fog::VcloudDirector::Compute::VappTemplate
 
         attribute :vdc
 

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

@@ -1,14 +1,13 @@
-require 'fog/core/collection'
 require 'fog/vcloud_director/models/compute/vapp'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Vapps < Collection
 
         include Fog::VcloudDirector::Query
 
-        model Fog::Compute::VcloudDirector::Vapp
+        model Fog::VcloudDirector::Compute::Vapp
 
         attribute :vdc
 

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

@@ -1,8 +1,6 @@
-require 'fog/core/model'
-
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Vdc < Model
         identity  :id
 

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

@@ -1,14 +1,13 @@
-require 'fog/core/collection'
 require 'fog/vcloud_director/models/compute/vdc'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Vdcs < Collection
 
         include Fog::VcloudDirector::Query
 
-        model Fog::Compute::VcloudDirector::Vdc
+        model Fog::VcloudDirector::Compute::Vdc
 
         attribute :organization
 

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

@@ -1,14 +1,12 @@
-require 'fog/core/model'
 require 'fog/vcloud_director/models/compute/vm_customization'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Vm < Model
         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
 
@@ -49,7 +50,7 @@ module Fog
           requires :id
           begin
             response = service.post_power_off_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -61,7 +62,7 @@ module Fog
           requires :id
           begin
             response = service.post_power_on_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -73,7 +74,7 @@ module Fog
           requires :id
           begin
             response = service.post_reboot_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -85,7 +86,7 @@ module Fog
           requires :id
           begin
             response = service.post_reset_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -96,7 +97,7 @@ module Fog
           requires :id
           begin
             response = service.post_undeploy_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -108,7 +109,7 @@ module Fog
           requires :id
           begin
             response = service.post_shutdown_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -120,7 +121,7 @@ module Fog
           requires :id
           begin
             response = service.post_suspend_vapp(id)
-          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+          rescue Fog::VcloudDirector::Compute::BadRequest => ex
             Fog::Logger.debug(ex.message)
             return false
           end
@@ -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,8 +1,6 @@
-require 'fog/core/model'
-
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class VmCustomization < Model
         identity  :id
 

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

@@ -1,11 +1,10 @@
-require 'fog/core/collection'
 require 'fog/vcloud_director/models/compute/vm_customization'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class VmCustomizations < Collection
-        model Fog::Compute::VcloudDirector::VmCustomization
+        model Fog::VcloudDirector::Compute::VmCustomization
 
         attribute :vm
 

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

@@ -1,8 +1,6 @@
-require 'fog/core/model'
-
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class VmNetwork < Model
         identity  :id
 

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

@@ -1,11 +1,10 @@
-require 'fog/core/collection'
 require 'fog/vcloud_director/models/compute/vm_network'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class VmNetworks < Collection
-        model Fog::Compute::VcloudDirector::VmNetwork
+        model Fog::VcloudDirector::Compute::VmNetwork
 
         attribute :vm
 

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

@@ -1,14 +1,13 @@
-require 'fog/core/collection'
 require 'fog/vcloud_director/models/compute/vm'
 
 module Fog
-  module Compute
-    class VcloudDirector
+  module VcloudDirector
+    class Compute
       class Vms < Collection
 
         include Fog::VcloudDirector::Query
 
-        model Fog::Compute::VcloudDirector::Vm
+        model Fog::VcloudDirector::Compute::Vm
 
         attribute :vapp
 
@@ -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/disks.rb

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

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

@@ -1,7 +1,7 @@
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         #
         # <Metadata xmlns="http://www.vmware.com/vcloud/v1.5" type="application/vnd.vmware.vcloud.metadata+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vmware.com/vcloud/v1.5 http://10.194.1.65/api/v1.5/schema/master.xsd">
         #     <Link rel="up" type="application/vnd.vmware.vcloud.vm+xml" href="https://example.com/api/vApp/vm-18545e82-d919-4071-ae7e-d1300d9d8112"/>

data/lib/fog/vcloud_director/parsers/compute/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/vapp.rb

@@ -0,0 +1,93 @@
+require 'fog/vcloud_director/parsers/compute/vm_parser_helper'
+
+module Fog
+  module VcloudDirector
+    module Parsers
+      module Compute
+        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

@@ -1,9 +1,9 @@
 require 'fog/vcloud_director/parsers/compute/vm_parser_helper'
 
 module Fog
-  module Parsers
-    module Compute
-      module VcloudDirector
+  module VcloudDirector
+    module Parsers
+      module Compute
         class Vm < VcloudDirectorParser
           include VmParserHelper
 
@@ -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