fog 1.36.0 → 1.37.0

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

@@ -32,6 +32,12 @@ module Fog
           end
           items
         end
+        
+        # Returns only disk drives (OVF resource type 17) and not controllers,
+        # etc. See <https://blogs.vmware.com/vapp/2009/11/virtual-hardware-in-ovf-part-1.html>
+        def storage_only
+          select {|d| d.resource_type == 17}
+        end
       end
     end
   end

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

@@ -11,6 +11,7 @@ module Fog
         model Fog::Compute::VcloudDirector::Network
 
         attribute :organization
+        attribute :vdc
 
         def query_type
           "orgVdcNetwork"
@@ -46,8 +47,12 @@ module Fog
         end
 
         def item_list
-          data = service.get_organization(organization.id).body
-          items = data[:Link].select { |link| link[:type] == "application/vnd.vmware.vcloud.orgNetwork+xml" }
+          items = if vdc
+            vdc.available_networks.select {|link| link[:type] == "application/vnd.vmware.vcloud.network+xml"}
+          else
+            data = service.get_organization(organization.id).body
+            data[:Link].select { |link| link[:type] == "application/vnd.vmware.vcloud.orgNetwork+xml" }
+          end
           items.each{|item| service.add_id_from_href!(item) }
           items
         end

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

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

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

@@ -11,6 +11,7 @@ module Fog
         attribute :vapp_name
         attribute :name
         attribute :type
+        attribute :description
         attribute :href
         attribute :status
         attribute :operating_system
@@ -154,7 +155,20 @@ module Fog
             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)
+          service.process_task(response.body)
+          options.each {|k,v| attributes[k] = v}
+        end
+        
         def ready?
           reload
           status == 'on'

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

@@ -33,6 +33,10 @@ module Fog
             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

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

@@ -43,6 +43,10 @@ module Fog
               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

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

@@ -24,6 +24,36 @@ module Fog
           )
         end
       end
+      class Mock
+        def delete_vapp(id)
+          unless vapp = data[:vapps][id]
+            raise Fog::Compute::VcloudDirector::Forbidden.new(
+              'This operation is denied.'
+            )
+          end
+          owner = {
+            :href => make_href("vApp/#{id}"),
+            :type => 'application/vnd.vmware.vcloud.vApp+xml'
+          }
+          task_id = enqueue_task(
+            "Deleting Virtual Application (#{id})", 'vdcDeleteVapp', owner,
+            :on_success => lambda do
+              data[:vapps].delete(id)
+            end
+          )
+          body = {
+            :xmlns => xmlns,
+            :xmlns_xsi => xmlns_xsi,
+            :xsi_schemaLocation => xsi_schema_location,
+          }.merge(task_body(task_id))
+
+          Excon::Response.new(
+            :status => 202,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
+        end
+      end
     end
   end
 end

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

@@ -32,9 +32,30 @@ module Fog
               "No access to entity \"(com.vmware.vcloud.entity.catalog:#{id})\"."
             )
           end
-
-          Fog::Mock.not_implemented
-          catalog.is_used_here # avoid warning from syntax checker
+          
+          items = data[:catalog_items].select {|_,v| v[:catalog] == id}
+          
+          body = {
+            :href => make_href("catalog/#{id}"),
+            :type => 'application/vnd.vmware.vcloud.catalog+xml',
+            :id   => id,
+            :name => catalog[:name],
+            :CatalogItems => {
+              :CatalogItem => items.map do |uuid,item|
+                {
+                  :href => make_href("catalogItem/#{uuid}"),
+                  :id   => uuid,
+                  :name => item[:name],
+                  :type => 'application/vnd.vmware.vcloud.catalogItem+xml'
+                }
+              end
+            },
+          }
+          Excon::Response.new(
+            :status => 200,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
         end
       end
     end

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

@@ -20,6 +20,29 @@ module Fog
           )
         end
       end
+      class Mock
+        def get_catalog_item(id)
+          unless item = data[:catalog_items][id]
+            raise Fog::Compute::VcloudDirector::Forbidden.new(
+              "No access to entity \"(com.vmware.vcloud.entity.catalogItem:#{id})\"."
+            )
+          end
+          body = {
+            :href => make_href("catalogItem/#{id}"),
+            :id   => id,
+            :name => item[:name],
+            :type => 'application/vnd.vmware.vcloud.catalogItem+xml',
+            :Entity => {
+              :href => make_href("vAppTemplate/#{item[:template_id]}")              
+            }
+          }
+          Excon::Response.new(
+            :status => 200,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
+        end
+      end
     end
   end
 end

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

@@ -25,6 +25,17 @@ module Fog
           )
         end
       end
+      class Mock
+        def get_metadata(id)
+          tags = data[:tags][id] || {}
+          body = {:type => 'application/vnd.vmware.vcloud.metadata+xml', :metadata => tags}
+          Excon::Response.new(
+            :status => 200,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
+        end
+      end
     end
   end
 end

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

@@ -63,6 +63,7 @@ module Fog
             :status => vm[:status],
             :deployed => vm[:deployed],
             :needsCustomization => vm[:needs_customization],
+            :Description => vm[:description],
             :"ovf:VirtualHardwareSection" => get_vm_virtual_hardware_section_body(id, vm),
             :"ovf:OperatingSystemSection" => get_vm_operating_system_section_body(id, vm),
             :NetworkConnectionSection     => get_vm_network_connection_section_body(id, vm),

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

@@ -23,6 +23,52 @@ module Fog
           )
         end
       end
+      class Mock
+        def get_vm(id)
+          vapp = get_vapp(id).body
+          vm = parse_vapp_to_vm(vapp)
+          body = {:type => vapp[:type], :vm => vm}
+          Excon::Response.new(
+            :status => 200,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
+        end
+        
+        # Mock equivalent of Fog::Parsers::Compute::VcloudDirector::Vm
+        def parse_vapp_to_vm(vapp)
+          parser = Fog::Parsers::Compute::VcloudDirector::Vm.new
+          vm = vapp.select {|k| [:href, :name, :status, :type].include? k}
+          network = vapp[:NetworkConnectionSection]
+          vm.merge({
+            :id => vapp[:href].split('/').last,
+            :status => parser.human_status(vapp[:status]),
+            :ip_address => network[:NetworkConnection][:IpAddress],
+            :description => vapp[:Description],
+            :cpu => get_hardware(vapp, 3),
+            :memory => get_hardware(vapp, 4),
+            :disks => get_disks(vapp),
+            :links => [vapp[:GuestCustomizationSection][:Link]],
+          })
+        end
+        
+        def get_hardware(vapp, resource_type)
+          hardware = vapp[:"ovf:VirtualHardwareSection"][:"ovf:Item"]
+          item = hardware.find {|h| h[:"rasd:ResourceType"].to_i == resource_type}
+          if item and item.key? :"rasd:VirtualQuantity"
+            item[:"rasd:VirtualQuantity"].to_i
+          else
+            nil
+          end
+        end
+        
+        def get_disks(vapp)
+          hardware = vapp[:"ovf:VirtualHardwareSection"][:"ovf:Item"]
+          disks = hardware.select {|h| h[:"rasd:ResourceType"].to_i == 17}
+          disks.map {|d| {d[:"rasd:ElementName"] => d[:"rasd:HostResource"][:ns12_capacity].to_i}}
+        end
+        
+      end
     end
   end
 end

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

@@ -26,6 +26,26 @@ module Fog
           )
         end
       end
+      class Mock
+        def get_vm_disks(id)
+          disks = data[:disks].values.select {|d| d[:parent_vm] == id}.each_with_index.map do |disk, i|
+            {
+              :address => i,
+              :description => disk[:description],
+              :name => disk[:name],
+              :id => (i+1)*1000,
+              :resource_type => 17,
+              :capacity => disk[:capacity],
+            }
+          end
+          body = {:type => 'application/vnd.vmware.vcloud.rasditemslist+xml', :disks => disks}
+          Excon::Response.new(
+            :status => 200,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
+        end
+      end
     end
   end
 end

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

@@ -26,6 +26,31 @@ module Fog
           )
         end
       end
+      class Mock
+        def get_vm_network(id)
+          vapp    = get_vapp(id).body
+          network = vapp[:NetworkConnectionSection]
+          connection = network[:NetworkConnection]
+          body = {
+            :type => network[:type],
+            :id   => network[:href].split('/')[-2],
+            :href => network[:href],
+            :info => network[:"ovf:Info"],
+            :primary_network_connection_index => network[:PrimaryNetworkConnectionIndex],
+            :network => connection[:network],
+            :needs_customization => connection[:needsCustomization],
+            :network_connection_index => connection[:NetworkConnectionIndex],
+            :is_connected => connection[:IsConnected],
+            :mac_address => connection[:MACAddress],
+            :ip_address_allocation_mode => connection[:IpAddressAllocationMode]
+          }
+          Excon::Response.new(
+            :status => 200,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
+        end
+      end
     end
   end
 end

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

@@ -23,6 +23,19 @@ module Fog
           )
         end
       end
+      class Mock
+        def get_vms(id)
+          vapp = get_vapp(id).body
+          parser = Fog::Parsers::Compute::VcloudDirector::Vms.new
+          vms  = vapp[:Children][:Vm].map {|child| parse_vapp_to_vm(child) }
+          body = {:type => vapp[:type], :vms => vms}
+          Excon::Response.new(
+            :status => 200,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
+        end
+      end
     end
   end
 end

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

@@ -105,6 +105,76 @@ module Fog
           end_point
         end
       end
+      
+      class Mock
+        # 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(
+              'No such template.'
+            )
+          end
+          unless vdc = data[:vdcs][options[:vdc_id]]
+            raise Fog::Compute::VcloudDirector::Forbidden.new(
+              'No such VDC.'
+            )
+          end
+          
+          vapp_uuid = uuid
+          vapp_id   = "vapp-#{vapp_uuid}"
+          owner = {
+            :href => make_href("vApp/#{vapp_id}"),
+            :type => 'application/vnd.vmware.vcloud.vm+xml'
+          }
+          task_id = enqueue_task(
+            "Creating Virtual Application #{vapp_name}(#{vapp_uuid})", 'vdcInstantiateVapp', owner,
+            :on_success => lambda do
+              # Add to the VDC
+              data[:vapps][vapp_id] = {
+                :name => vapp_name,
+                :vdc_id => options[:vdc_id],
+                :description => 'From Template',
+                :networks => [
+                  {:parent_id => default_network_uuid }
+                ]
+              }
+              vm_id = "vm-#{uuid}"
+              data[:vms][vm_id] = {
+                :name => vapp_name,
+                :parent_vapp => vapp_id,
+                :nics => [
+                  {
+                    :network_name => 'Default Network',
+                    :mac_address  => '7d:68:a2:a0:a4:f8',
+                    :ip_address   => nil
+                  }
+                ]
+              }
+              data[:disks][uuid] = {
+                :name => 'Hard Disk 1',
+                :capacity => 10240,
+                :parent_vm => vm_id
+              }
+            end
+          )
+          body = {
+            :href => make_href("vApp/#{vapp_id}"),
+            :Tasks => {
+              :Task => {
+                :xmlns => xmlns,
+                :xmlns_xsi => xmlns_xsi,
+                :xsi_schemaLocation => xsi_schema_location,
+              }.merge(task_body(task_id))
+            }
+          }
+
+          Excon::Response.new(
+            :status => 202,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
+        end
+      end
     end
   end
 end