fog 1.37.0 → 1.38.0

data/lib/fog/vcloud_director/generators/compute/recompose_vapp.rb

@@ -0,0 +1,34 @@
+require 'fog/vcloud_director/generators/compute/compose_common'
+
+module Fog
+  module Generators
+    module Compute
+      module VcloudDirector
+        # @see http://pubs.vmware.com/vcd-51/index.jsp#types/RecomposeVAppParamsType.html
+        class RecomposeVapp
+
+          include ComposeCommon
+
+          def generate_xml
+            Nokogiri::XML::Builder.new do |xml|
+              xml.RecomposeVAppParams(vapp_attrs) {
+                if has_source_items?
+                  build_vapp_instantiation_params(xml)
+                  build_source_items(xml)
+                end
+                build_delete_items(xml)
+              }
+            end.to_xml
+          end
+
+          private
+
+          def build_delete_items(xml)
+             @configuration[:vms_to_delete].each { |vm| xml.DeleteItem(:href => vm.href) }
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -12,6 +12,13 @@ module Fog
         attribute :description, :aliases => :Description
         attribute :vapp_template_id
 
+        
+        def vapp_template
+          requires :id
+          service.vapp_templates.get(self.vapp_template_id)
+        end
+        
+        
         def instantiate(vapp_name, options={})
           response = service.instantiate_vapp_template(vapp_name, vapp_template_id, options)
           service.process_task(response.body[:Tasks][:Task])

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

@@ -0,0 +1,52 @@
+require 'fog/core/model'
+require 'fog/vcloud_director/models/compute/vm_customization'
+
+module Fog
+  module Compute
+    class VcloudDirector
+      class TemplateVm < Model
+        identity  :id
+
+        attribute :vapp_template_id
+        attribute :vapp_template_name
+        attribute :name
+        attribute :type
+        attribute :href
+
+        def reload
+          #Parent vapp_name & id are nil on a template_vm. Adding them from the collection parent
+          self.vapp_template_id = collection.vapp_template.id
+          self.vapp_template_name = collection.vapp_template.name
+        end
+
+
+        def tags
+          requires :id
+          service.tags(:vm => self)
+        end
+
+        def customization
+          requires :id
+          data = service.get_vm_customization(id).body
+          service.vm_customizations.new(data)
+        end
+
+        def network
+          requires :id
+          data = service.get_vm_network(id).body
+          service.vm_networks.new(data)
+        end
+
+        def disks
+          requires :id
+          service.disks(:vm => self)
+        end
+        
+
+        def vapp_template
+          service.vapp_templates.get(vapp_template_id)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+require 'fog/core/collection'
+require 'fog/vcloud_director/models/compute/vm'
+
+module Fog
+  module Compute
+    class VcloudDirector
+      class TemplateVms < Collection
+
+        include Fog::VcloudDirector::Query
+
+        model Fog::Compute::VcloudDirector::TemplateVm
+
+        attribute :vapp_template
+
+
+        def get_single_vm(vm_id)
+          item = service.get_template_vm(vm_id).body
+          return nil unless item
+          new(item[:vm])
+        end
+
+        def query_type
+          "vm"
+        end
+
+        private
+
+        def get_by_id(item_id)
+          item = item_list.find{ |vm| vm[:id] == item_id }
+          item
+        end
+
+        def item_list
+          data = service.get_template_vms(vapp_template.id).body  # vapp.id
+          items = data[:vms]
+          items
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class VcloudDirector
+      class VappTemplate < Model
+        identity  :id
+
+        attribute :name
+        attribute :type
+        attribute :href
+        attribute :description, :aliases => :Description
+        attribute :status
+        attribute :lease_settings, :aliases => :LeaseSettingsSection
+        attribute :network_section, :aliases => :"ovf:NetworkSection", :squash => :"ovf:Network"
+        attribute :network_config, :aliases => :NetworkConfigSection, :squash => :NetworkConfig
+        attribute :owner, :aliases => :Owner, :squash => :User
+
+        def vms
+          requires :id
+          service.template_vms(:vapp_template => self)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+require 'fog/core/collection'
+require 'fog/vcloud_director/models/compute/vapp'
+
+module Fog
+  module Compute
+    class VcloudDirector
+      class VappTemplates < Collection
+
+        include Fog::VcloudDirector::Query
+
+        model Fog::Compute::VcloudDirector::VappTemplate
+
+        attribute :vdc
+
+        def query_type
+          "vAppTemplate"
+        end
+
+        private
+
+        def get_by_id(item_id)
+          item = service.get_vapp_template(item_id).body
+          %w(:Link).each {|key_to_delete| item.delete(key_to_delete) }
+          service.add_id_from_href!(item)
+          item[:Description] ||= ""
+          item
+        end
+
+        def item_list
+          data = service.get_vdc(vdc.id).body
+          return [] if data[:ResourceEntities].empty?
+          resource_entities = data[:ResourceEntities][:ResourceEntity]
+          items = resource_entities.select { |link| link[:type] == "application/vnd.vmware.vcloud.vAppTemplate+xml" }
+          items.each{|item| service.add_id_from_href!(item) }
+          items
+        end
+      end
+    end
+  end
+end

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

@@ -30,6 +30,11 @@ module Fog
           service.vapps(:vdc => self)
         end
         
+        def vapp_templates
+          requires :id
+          service.vapp_templates(:vdc => self)
+        end
+        
         def networks
           requires :available_networks
           service.networks(:vdc => self)

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

@@ -14,11 +14,13 @@ module Fog
         attribute :description
         attribute :href
         attribute :status
+        attribute :deployed
         attribute :operating_system
         attribute :ip_address
         attribute :cpu, :type => :integer
         attribute :memory, :type => :integer
         attribute :hard_disks, :aliases => :disks
+        attribute :network_adapters
 
         def reload
           # when collection.vapp is nil, it means it's fatherless,
@@ -90,6 +92,17 @@ module Fog
           service.process_task(response.body)
         end
 
+        def undeploy
+          requires :id
+          begin
+            response = service.post_undeploy_vapp(id)
+          rescue Fog::Compute::VcloudDirector::BadRequest => ex
+            Fog::Logger.debug(ex.message)
+            return false
+          end
+          service.process_task(response.body)
+        end
+
         # Shut down the VM.
         def shutdown
           requires :id

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

@@ -1,8 +1,12 @@
+require 'fog/vcloud_director/parsers/compute/vm_parser_helper'
+
 module Fog
   module Parsers
     module Compute
       module VcloudDirector
         class Vm < VcloudDirectorParser
+          include VmParserHelper
+
           def reset
             @in_operating_system = false
             @in_children = false
@@ -13,30 +17,23 @@ module Fog
 
           def start_element(name, attributes)
             super
-            case name
-            when 'OperatingSystemSection'
-              @in_operating_system = true
-            when 'Vm'
+            if name == 'Vm'
               vm_attrs = extract_attributes(attributes)
-              @response[:vm].merge!(vm_attrs.reject {|key,value| ![:href, :name, :status, :type].include?(key)})
+              @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])
-            when 'HostResource'
-              @current_host_resource = extract_attributes(attributes)
-            when 'Link'
-              @links << extract_attributes(attributes)
+              @response[:vm][:deployed] = @response[:vm][:deployed] == 'true'
+            else
+              parse_start_element name, attributes, @response[:vm]
             end
           end
 
           def end_element(name)
+            parse_end_element name, @response[:vm]
             case name
             when 'IpAddress'
               @response[:vm][:ip_address] = value
             when 'Description'
-              # Assume the very first Description we find is the VM description
-              if !@response[:vm][:description]
-                @response[:vm][:description] = value
-              end
               if @in_operating_system
                 @response[:vm][:operating_system] = value
                 @in_operating_system = false
@@ -53,9 +50,17 @@ module Fog
             when 'ElementName'
               @element_name = value
             when 'Item'
-              if @resource_type == '17' # disk
+              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

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

@@ -34,6 +34,7 @@ module Fog
               @response[:admin_password] = value
             when 'AdminPasswordEnabled'
               @response[:admin_password_enabled] = (value == "true")
+              @response[:admin_password] = '' unless @response[:admin_password_enabled]
             when 'AdminPasswordAuto'
               @response[:admin_password_auto] = (value == "true")
             when 'ResetPasswordRequired'

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

@@ -0,0 +1,62 @@
+module Fog
+  module Parsers
+    module Compute
+      module VcloudDirector
+        module VmParserHelper
+
+          def parse_end_element(name, vm)
+            case name
+            when 'IpAddress'
+              vm[:ip_address] = value
+            when 'Description'
+              if @in_operating_system
+                vm[:operating_system] = value
+                @in_operating_system = false
+              end
+            when 'ResourceType'
+              @resource_type = value
+            when 'VirtualQuantity'
+              case @resource_type
+              when '3'
+                vm[:cpu] = value
+              when '4'
+                vm[:memory] = value
+              end
+            when 'ElementName'
+              @element_name = value
+            when 'Item'
+              if @resource_type == '17' # disk
+                vm[:disks] ||= []
+                vm[:disks] << { @element_name => @current_host_resource[:capacity].to_i }
+              end
+            when 'Connection'
+              vm[:network_adapters] ||= []
+              vm[:network_adapters] << {
+                :ip_address => @current_network_connection[:ipAddress],
+                :primary => (@current_network_connection[:primaryNetworkConnection] == 'true'),
+                :ip_allocation_mode => @current_network_connection[:ipAddressingMode],
+                :network => value
+              }
+            when 'Link'
+              vm[:links] = @links
+            end
+          end
+
+          def parse_start_element(name, attributes, vm)
+            case name
+            when 'OperatingSystemSection'
+              @in_operating_system = true
+            when 'HostResource'
+              @current_host_resource = extract_attributes(attributes)
+            when 'Connection'
+              @current_network_connection = extract_attributes(attributes)
+            when 'Link'
+              @links << extract_attributes(attributes)
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,12 @@
+require 'fog/vcloud_director/parsers/compute/vm_parser_helper'
+
 module Fog
   module Parsers
     module Compute
       module VcloudDirector
         class Vms < VcloudDirectorParser
+          include VmParserHelper
+
           def reset
             @vm = { :ip_address => '' }
             @in_operating_system = false
@@ -15,63 +19,32 @@ module Fog
           def start_element(name, attributes)
             super
             case name
-            when 'OperatingSystemSection'
-              @in_operating_system = true
-            when 'VApp'
-              vapp = extract_attributes(attributes)
-              @response.merge!(vapp.reject {|key,value| ![:href, :name, :size, :status, :type].include?(key)})
-              @response[:id] = @response[:href].split('/').last
             when 'Vm'
               vapp = extract_attributes(attributes)
-              @vm.merge!(vapp.reject {|key,value| ![:href, :name, :status, :type].include?(key)})
+              @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])
+            when 'VApp'
+              vapp = extract_attributes(attributes)
+              @response.merge!(vapp.reject {|key,value| ![:href, :name, :size, :status, :type].include?(key)})
+              @response[:id] = @response[:href].split('/').last
             when 'Children'
               @in_children = true
-            when 'HostResource'
-              @current_host_resource = extract_attributes(attributes)
-            when 'Link'
-              @links << extract_attributes(attributes)
+            else
+              parse_start_element name, attributes, @vm
             end
           end
 
           def end_element(name)
             if @in_children
-              case name
-              when 'IpAddress'
-                @vm[:ip_address] = value
-              when 'Description'
-                if !@vm[:description]
-                  # Assume the first description we find is the VM description
-                  @vm[:description] = value
-                end
-                if @in_operating_system
-                  @vm[:operating_system] = value
-                  @in_operating_system = false
-                end
-              when 'ResourceType'
-                @resource_type = value
-              when 'VirtualQuantity'
-                case @resource_type
-                when '3'
-                  @vm[:cpu] = value
-                when '4'
-                  @vm[:memory] = value
-                end
-              when 'ElementName'
-                @element_name = value
-              when 'Item'
-                if @resource_type == '17' # disk
-                  @vm[:disks] ||= []
-                  @vm[:disks] << { @element_name => @current_host_resource[:capacity].to_i }
-                end
-              when 'Link'
-                @vm[:links] = @links
-              when 'Vm'
+              if name == 'Vm'
                 @response[:vms] << @vm
                 @vm = {}
+              else
+                parse_end_element name, @vm
               end
             end
           end