fog 1.27.0 → 1.28.0

data/lib/fog/ovirt/requests/compute/detach_volume.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class Ovirt
+      class Real
+        def detach_volume(id, options)
+          raise ArgumentError, "instance id is a required parameter" unless id
+          raise ArgumentError, "volume id is a required parameter for detach-volume" unless options.key? :id
+
+          client.detach_volume(id, options[:id])
+        end
+      end
+
+      class Mock
+        def detach_volume(id, options)
+          raise ArgumentError, "instance id is a required parameter" unless id
+          raise ArgumentError, "volume id is a required parameter for detach-volume" unless options.key? :id
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/ovirt/requests/compute/list_volumes.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Compute
+    class Ovirt
+      class Real
+        def list_volumes
+          client.disks.map {|ovirt_obj| ovirt_attrs ovirt_obj}
+        end
+      end
+      class Mock
+        def list_volumes
+          xml = read_xml 'disks.xml'
+          Nokogiri::XML(xml).xpath('/disks/disk').map do |vol|
+            ovirt_attrs OVIRT::Volume::new(self, vol)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/ovirt/requests/compute/mock_files/disks.xml

@@ -0,0 +1,58 @@
+<disks>
+  <disk href="/api/disks/4d1abf9a-da81-4de2-bf20-f5f060018e05" id="4d1abf9a-da81-4de2-bf20-f5f060018e05">
+      <actions>
+          <link href="/api/disks/4d1abf9a-da81-4de2-bf20-f5f060018e05/export" rel="export"/>
+          <link href="/api/disks/4d1abf9a-da81-4de2-bf20-f5f060018e05/move" rel="move"/>
+          <link href="/api/disks/4d1abf9a-da81-4de2-bf20-f5f060018e05/copy" rel="copy"/>
+      </actions>
+      <name>Disk 2</name>
+      <link href="/api/disks/4d1abf9a-da81-4de2-bf20-f5f060018e05/permissions" rel="permissions"/>
+      <link href="/api/disks/4d1abf9a-da81-4de2-bf20-f5f060018e05/statistics" rel="statistics"/>
+      <alias>Disk 2</alias>
+      <image_id>d6034a90-39fa-46ee-888f-208a76f3baa4</image_id>
+      <storage_domains>
+          <storage_domain id="a23a4329-33b9-4246-a393-4f91071825b6"/>
+      </storage_domains>
+      <size>4294967296</size>
+      <provisioned_size>4294967296</provisioned_size>
+      <actual_size>1073741824</actual_size>
+      <status>
+          <state>ok</state>
+      </status>
+      <interface>virtio</interface>
+      <format>cow</format>
+      <sparse>true</sparse>
+      <bootable>false</bootable>
+      <shareable>false</shareable>
+      <wipe_after_delete>false</wipe_after_delete>
+      <propagate_errors>false</propagate_errors>
+  </disk>
+  <disk href="/api/disks/cfebdac5-cefb-488a-8b55-f5f273a1e863" id="cfebdac5-cefb-488a-8b55-f5f273a1e863">
+      <actions>
+          <link href="/api/disks/cfebdac5-cefb-488a-8b55-f5f273a1e863/export" rel="export"/>
+          <link href="/api/disks/cfebdac5-cefb-488a-8b55-f5f273a1e863/move" rel="move"/>
+          <link href="/api/disks/cfebdac5-cefb-488a-8b55-f5f273a1e863/copy" rel="copy"/>
+      </actions>
+      <name>Disk 3</name>
+      <link href="/api/disks/cfebdac5-cefb-488a-8b55-f5f273a1e863/permissions" rel="permissions"/>
+      <link href="/api/disks/cfebdac5-cefb-488a-8b55-f5f273a1e863/statistics" rel="statistics"/>
+      <alias>Disk 3</alias>
+      <image_id>3d7edbe9-54e1-484c-a77c-3d170f1906bb</image_id>
+      <storage_domains>
+          <storage_domain id="c8431bb5-f57b-4ce8-8ba0-17c1859bc767"/>
+      </storage_domains>
+      <size>21474836480</size>
+      <provisioned_size>21474836480</provisioned_size>
+      <actual_size>1073741824</actual_size>
+      <status>
+          <state>ok</state>
+      </status>
+      <interface>virtio</interface>
+      <format>cow</format>
+      <sparse>true</sparse>
+      <bootable>false</bootable>
+      <shareable>false</shareable>
+      <wipe_after_delete>false</wipe_after_delete>
+      <propagate_errors>false</propagate_errors>
+  </disk>
+</disks>

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

@@ -36,10 +36,10 @@ module Fog
         def non_running?
           if @service.show_progress? && (@last_progress ||= 0) < 100
             if status == 'running'
-              Formatador.redisplay_progressbar(progress, 100, :label => operation_name, :started_at => start_time)
+              Fog::Formatador.redisplay_progressbar(progress, 100, :label => operation_name, :started_at => start_time)
               @last_progress = progress
             elsif status == 'success'
-              Formatador.redisplay_progressbar(100, 100, :label => operation_name, :started_at => start_time)
+              Fog::Formatador.redisplay_progressbar(100, 100, :label => operation_name, :started_at => start_time)
               @last_progress = 100
             end
           end

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.27.0'
+  VERSION = '1.28.0'
 end

data/lib/fog/vsphere/compute.rb

@@ -41,6 +41,7 @@ module Fog
 
       request_path 'fog/vsphere/requests/compute'
       request :current_time
+      request :cloudinit_to_customspec
       request :list_virtual_machines
       request :vm_power_off
       request :vm_power_on
@@ -58,6 +59,8 @@ module Fog
       request :get_network
       request :list_datastores
       request :get_datastore
+      request :list_compute_resources
+      request :get_compute_resource
       request :list_templates
       request :get_template
       request :get_folder

data/lib/fog/vsphere/requests/compute/cloudinit_to_customspec.rb

@@ -3,24 +3,33 @@ module Fog
     class Vsphere
       class Real
         def cloudinit_to_customspec(user_data)
-          raise ArgumentError, "user_data cant be nil" if user_data.nil?
-          custom_spec = Hash.new 
+          raise ArgumentError, "user_data can't be nil" if user_data.nil?
+          custom_spec = { 'customization_spec' => Hash.new }
           user_data = YAML.load(user_data)
-          custom_spec['hostname']                 =  user_data['hostname'] if user_data.key?('hostname')
-          custom_spec['ipsettings']               =  { 'ip' => user_data['ip'] } if user_data.key?('ip')
-          custom_spec['ipsettings']['subnetMask'] =  user_data['netmask'] if user_data.key?('netmask')
-          custom_spec['domain']                   =  user_data['domain'] if user_data.key?('domain')
-          custom_spec['dnsServerList']            =  user_data['dns'] if user_data.key?('dns')
-          custom_spec['dnsSuffixList']            =  user_data['domain'] if user_data.key?('domain')
-          custom_spec['time_zone']                =  user_data['timezone'] if user_data.key?('timezone')
+          custom_spec['hostname']                    =  user_data['hostname'] if user_data.key?('hostname')
+          custom_spec['ipsettings']                  =  { 'ip' => user_data['ip'] } if user_data.key?('ip')
+          custom_spec['ipsettings']['subnetMask']    =  user_data['netmask'] if user_data.key?('netmask')
+          custom_spec['ipsettings']['dnsServerList'] =  user_data['dns'] if user_data.key?('dns')
+          custom_spec['domain']                      =  user_data['domain'] if user_data.key?('domain')
+          custom_spec['dnsSuffixList']               =  user_data['domain'] if user_data.key?('domain')
+          custom_spec['time_zone']                   =  user_data['timezone'] if user_data.key?('timezone')
           custom_spec           
         end
       end
 
       class Mock
         def cloudinit_to_customspec(user_data)
-          raise ArgumentError, "user_data cant be nil" if user_data.nil?
-          true
+          raise ArgumentError, "user_data can't be nil" if user_data.nil?
+          custom_spec = { 'customization_spec' => Hash.new }
+          user_data = YAML.load(user_data)
+          custom_spec['hostname']                    =  user_data['hostname'] if user_data.key?('hostname')
+          custom_spec['ipsettings']                  =  { 'ip' => user_data['ip'] } if user_data.key?('ip')
+          custom_spec['ipsettings']['subnetMask']    =  user_data['netmask'] if user_data.key?('netmask')
+          custom_spec['ipsettings']['dnsServerList'] =  user_data['dns'] if user_data.key?('dns')
+          custom_spec['domain']                      =  user_data['domain'] if user_data.key?('domain')
+          custom_spec['dnsSuffixList']               =  user_data['domain'] if user_data.key?('domain')
+          custom_spec['time_zone']                   =  user_data['timezone'] if user_data.key?('timezone')
+          custom_spec
         end
       end
     end

data/lib/fog/vsphere/requests/compute/get_compute_resource.rb

@@ -0,0 +1,41 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def get_compute_resource(name, datacenter_name)
+          compute_resource = get_raw_compute_resource(name, datacenter_name)
+          raise(Fog::Compute::Vsphere::NotFound) unless compute_resource
+          compute_resource_attributes(compute_resource, datacenter_name)
+        end
+
+        protected
+
+        def get_raw_compute_resource(name, datacenter_name)
+          find_raw_datacenter(datacenter_name).find_compute_resource(name)
+        end
+      end
+
+      class Mock
+        def get_compute_resource(name, datacenter_name)
+          {
+            :id=>"domain-s7", 
+            :name=>"fake-host", 
+            :totalCpu=>33504, 
+            :totalMemory=>154604142592, 
+            :numCpuCores=>12, 
+            :numCpuThreads=>24, 
+            :effectiveCpu=>32247, 
+            :effectiveMemory=>135733, 
+            :numHosts=>1, 
+            :numEffectiveHosts=>1, 
+            :overallStatus=>"gray", 
+            :overallCpuUsage=>15682, 
+            :overallMemoryUsage=>132755, 
+            :effective=>true, 
+            :isSingleHost=>true
+          }
+        end
+      end
+    end
+  end
+end

data/lib/fog/vsphere/requests/compute/get_network.rb

@@ -10,15 +10,44 @@ module Fog
 
         protected
 
-        def get_raw_network(name, datacenter_name, distributedswitch_name=nil)
+        def get_raw_network(name, datacenter_name, distributedswitch=nil)
+          finder = choose_finder(name, distributedswitch)
+          networks = get_all_raw_networks(datacenter_name)
+          networks.find { |n| finder.call(n) }
+        end
+      end
+
+      module Shared
+
+        protected
+
+        def get_all_raw_networks(datacenter_name)
           dc = find_raw_datacenter(datacenter_name)
+          @connection.serviceContent.viewManager.
+            CreateContainerView({
+                                 :container => dc.networkFolder,
+                                 :type =>      ["Network"],
+                                 :recursive => true
+                                }).view
+        end
 
-          @connection.serviceContent.viewManager.CreateContainerView({
-            :container  => dc.networkFolder,
-            :type       =>  ["Network"],
-            :recursive  => true
-          }).view.select { |n| n.name == name and (not distributedswitch_name or n.config.distributedVirtualSwitch.name == distributedswitch_name)}.first
+        def choose_finder(name, distributedswitch)
+          case distributedswitch
+          when String
+            # only the one will do
+            Proc.new { |n| (n.name == name) &&
+                (n.class.to_s == "DistributedVirtualPortgroup") &&
+                (n.config.distributedVirtualSwitch.name == distributedswitch)
+            }
+          when :dvs
+            # the first distributed virtual switch will do - selected by network - gives control to vsphere
+            Proc.new { |n| (n.name == name) && (n.class.to_s == "DistributedVirtualPortgroup") }
+          else
+            # the first matching network will do, seems like the non-distributed networks come first
+            Proc.new { |n| (n.name == name) }
+          end
         end
+
       end
 
       class Mock

data/lib/fog/vsphere/requests/compute/get_resource_pool.rb

@@ -13,7 +13,7 @@ module Fog
         def get_raw_resource_pool(name, cluster_name, datacenter_name)
           dc      = find_raw_datacenter(datacenter_name)
           cluster = dc.find_compute_resource(cluster_name)
-          cluster.resourcePool.find name
+          name.nil? ? cluster.resourcePool : cluster.resourcePool.find( name)
         end
       end
 

data/lib/fog/vsphere/requests/compute/get_virtual_machine.rb

@@ -3,6 +3,7 @@ module Fog
     class Vsphere
       class Real
         def get_virtual_machine(id, datacenter_name = nil)
+          # The larger the VM list the longer it will take if not searching based on UUID.
           convert_vm_mob_ref_to_attr_hash(get_vm_ref(id, datacenter_name))
         end
 
@@ -11,21 +12,26 @@ module Fog
         def get_vm_ref(id, dc = nil)
           raw_datacenter = find_raw_datacenter(dc) if dc
           vm = case is_uuid?(id)
-            # UUID based
-            when true
-              params = {:uuid => id, :vmSearch => true, :instanceUuid => true}
-              params[:datacenter] = raw_datacenter if dc
-              @connection.searchIndex.FindByUuid(params)
-            else
-              # try to find based on VM name
-              if dc
-                raw_datacenter.find_vm(id)
-              else
-                raw_datacenters.map { |d| d.find_vm(id) }.compact.first
-              end
-          end
+                 # UUID based
+                 when true
+                   params = {:uuid => id, :vmSearch => true, :instanceUuid => true}
+                   params[:datacenter] = raw_datacenter if dc
+                   @connection.searchIndex.FindByUuid(params)
+                 else
+                   # try to find based on VM name
+                   if dc
+                     get_vm_by_name(id, dc)
+                   else
+                     raw_datacenters.map { |d| get_vm_by_name(id, d["name"])}.compact.first
+                   end
+               end
           vm ? vm : raise(Fog::Compute::Vsphere::NotFound, "#{id} was not found")
         end
+
+        def get_vm_by_name(name, dc)
+          vms = raw_list_all_virtual_machines(dc)
+          vms.keep_if { |v| v["name"] == name }.first
+        end
       end
 
       class Mock

data/lib/fog/vsphere/requests/compute/list_compute_resources.rb

@@ -0,0 +1,92 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def list_compute_resources(filters = { })
+          datacenter_name = filters[:datacenter]
+          # default to show all compute_resources
+          only_active = filters[:effective] || false
+          compute_resources = raw_compute_resources datacenter_name
+          
+          compute_resources.map do |compute_resource|
+            summary = compute_resource.summary
+            next if only_active and summary.numEffectiveHosts == 0
+            compute_resource_attributes(compute_resource, datacenter_name)
+          end.compact
+        end
+        
+        def raw_compute_resources(datacenter_name)
+          find_raw_datacenter(datacenter_name).find_compute_resource('').children
+        end
+
+        protected
+
+        def compute_resource_attributes compute_resource, datacenter
+          overall_usage = compute_resource.host.inject({:overallCpuUsage=>0, :overallMemoryUsage=>0}) do |sum, host|
+            {
+              :overallCpuUsage => sum[:overallCpuUsage]+(host.summary.quickStats.overallCpuUsage || 0), 
+              :overallMemoryUsage=> sum[:overallMemoryUsage]+(host.summary.quickStats.overallMemoryUsage || 0)
+            }
+          end
+          {
+            :id                 =>   managed_obj_id(compute_resource),
+            :name               =>   compute_resource.name,
+            :totalCpu           =>   compute_resource.summary.totalCpu, 
+            :totalMemory        =>   compute_resource.summary.totalMemory,
+            :numCpuCores        =>   compute_resource.summary.numCpuCores, 
+            :numCpuThreads      =>   compute_resource.summary.numCpuThreads,
+            :effectiveCpu       =>   compute_resource.summary.effectiveCpu,
+            :effectiveMemory    =>   compute_resource.summary.effectiveMemory,
+            :numHosts           =>   compute_resource.summary.numHosts,
+            :numEffectiveHosts  =>   compute_resource.summary.numEffectiveHosts,
+            :overallStatus      =>   compute_resource.summary.overallStatus,
+            :overallCpuUsage    =>   overall_usage[:overallCpuUsage],
+            :overallMemoryUsage =>   overall_usage[:overallMemoryUsage],
+            :effective          =>   compute_resource.summary.numEffectiveHosts > 0,
+            :isSingleHost       =>   compute_resource.summary.numHosts == 1
+          }
+        end
+
+      end
+      class Mock
+        def list_compute_resources(filters = { })
+          [
+            {
+              :id=>"domain-s7", 
+              :name=>"fake-host", 
+              :totalCpu=>33504, 
+              :totalMemory=>154604142592, 
+              :numCpuCores=>12, 
+              :numCpuThreads=>24, 
+              :effectiveCpu=>32247, 
+              :effectiveMemory=>135733, 
+              :numHosts=>1, 
+              :numEffectiveHosts=>1, 
+              :overallStatus=>"gray", 
+              :overallCpuUsage=>15682, 
+              :overallMemoryUsage=>132755, 
+              :effective=>true, 
+              :isSingleHost=>true
+            }, {
+              :id=>"domain-s74", 
+              :name=>"fake-cluster", 
+              :totalCpu=>41484, 
+              :totalMemory=>51525996544, 
+              :numCpuCores=>12, 
+              :numCpuThreads=>24, 
+              :effectiveCpu=>37796, 
+              :effectiveMemory=>45115, 
+              :numHosts=>2, 
+              :numEffectiveHosts=>2, 
+              :overallStatus=>"gray", 
+              :overallCpuUsage=>584, 
+              :overallMemoryUsage=>26422, 
+              :effective=>true, 
+              :isSingleHost=>false
+            }
+          ]
+        end
+      end
+    end
+  end
+end

data/lib/fog/vsphere/requests/compute/list_virtual_machines.rb

@@ -17,6 +17,7 @@ module Fog
           end
         end
 
+
         private
 
         def list_all_virtual_machines_in_folder(path, datacenter_name)
@@ -29,23 +30,27 @@ module Fog
         end
 
         def list_all_virtual_machines(options = { })
-          datacenters = find_datacenters(options[:datacenter])
-
-          vms = datacenters.map do |dc|
-            @connection.serviceContent.viewManager.CreateContainerView({
-              :container  => dc.vmFolder,
-              :type       =>  ["VirtualMachine"],
-              :recursive  => true
-            }).view
-          end.flatten
-
-          vms = convert_vm_view_to_attr_hash(vms)
+          raw_vms = raw_list_all_virtual_machines(options[:datacenter])
+          vms = convert_vm_view_to_attr_hash(raw_vms)
 
           # remove all template based virtual machines
           vms.delete_if { |v| v['template'] }
           vms
         end
 
+        def raw_list_all_virtual_machines(datacenter_name = nil)
+          ## Moved this to its own function since trying to get a list of all virtual machines
+          ## to parse for a find function took way too long. The raw list returned will make it
+          ## much faster to interact for some functions.
+          datacenters = find_datacenters(datacenter_name)
+          datacenters.map do |dc|
+            @connection.serviceContent.viewManager.CreateContainerView({
+                                                                           :container  => dc.vmFolder,
+                                                                           :type       =>  ["VirtualMachine"],
+                                                                           :recursive  => true
+                                                                       }).view
+          end.flatten
+        end
         def get_folder_path(folder, root = nil)
           if (not folder.methods.include?('parent')) or (folder == root)
             return