fog-vsphere 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6948368d6c3ede9335c8c621c43c5c72a54f8747
-  data.tar.gz: e5eb87794542a2b897959da77baedea015f77d97
+  metadata.gz: 434e3b3463c5006cc61edfae3028d40ab4dca98d
+  data.tar.gz: 12a91a040ca124230c2454076861dc09ea72cf5d
 SHA512:
-  metadata.gz: d7b9b802dbbf729f610364aa5a08fe9ad2bce3f1653ff6832db9ed752c362028342fad45571ffa13ca69f3c357ad727ad415a94c6699797021696e2d33b55f2a
-  data.tar.gz: d1e3c7165715a76e4b08d3ba9af8e16895c426396bef500986d02be02bb7cae94e6a41c9daf3d4feee2f3362a04471f7a1e53b52eea2e74b1d8a3dd8ec037bac
+  metadata.gz: 2675e30b127dc42fe10d99ded01be9464b4e7fd0b00110056871a56f92f8e9e31ec28814ede6f79d6bd7781c812ff105d0d8184bda052ebcadc04759a683f268
+  data.tar.gz: ff34150ecd8f6a1788565ea7c2f047b0696ce4e94ae89baabd4cb8b83502fa5af3ccd54533e838ae46aaea3d5cc38afb586f60e4810fe3889298feb2d437d754

data/.gitignore

@@ -20,4 +20,5 @@ tmp
 *.o
 *.a
 mkmf.log
-gemfiles/*.lock
+gemfiles/*.lock
+.*.swp

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v1.13.0
+
+* Add ability to change boot order on VM clone (#110)
+* Support cloning volumes in different datastore (#107)
+* Add ability to generate new mac addresses on VM clone (#109)
+* Fix list_compute_resources error when folder nested inside datacenter level (#100)
+* Updated list_clusters to have an optional param or allow filtering on datacenter (#102)
+* Add check option for vm_migrate
+* Add vm_relocate request
+
 ## v1.12.0
 
 * Add existing state validation for power on/off requests

data/CONTRIBUTORS.md

@@ -9,6 +9,7 @@
 * Christopher Oliver <coliver@datapipe.com>
 * Cyrus Team <cyrusteam@cyruslists.com>
 * Darren Foo <stonith@users.noreply.github.com>
+* Derek Wright <derekmwright@users.noreply.github.com>
 * Dominic Cleal <dcleal@redhat.com>
 * Eric Stonfer <ericstonfer@yahoo.com>
 * Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>

data/lib/fog/vsphere/compute.rb

@@ -126,6 +126,7 @@ module Fog
       request :vm_revert_snapshot
       request :vm_remove_snapshot
       request :vm_acquire_ticket
+      request :vm_relocate
 
       module Shared
         attr_reader :vsphere_is_vcenter

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

@@ -2,11 +2,17 @@ module Fog
   module Compute
     class Vsphere
       class Real
-        def list_clusters(filters = { })
-          datacenter_name = filters[:datacenter]
 
-          raw_clusters(datacenter_name).map do |cluster|
-            cluster_attributes(cluster, datacenter_name)
+        def list_clusters(filters = {})
+          datacenter_name = filters[:datacenter] if filters.key? :datacenter
+          if datacenter_name.nil?
+            list_datacenters.map { |dc| list_clusters(:datacenter => dc[:name]) }.flatten
+          else
+            raw_clusters(datacenter_name).map do |cluster|
+              if cluster.instance_of? RbVmomi::VIM::ClusterComputeResource
+                cluster_attributes(cluster, datacenter_name)
+              end
+            end.compact
           end
         end
 
@@ -27,41 +33,41 @@ module Fog
           end.flatten
         end
 
-        def cluster_attributes cluster, datacenter_name
+        def cluster_attributes(cluster, datacenter_name)
           {
-            :id             => managed_obj_id(cluster),
-            :name           => cluster.name,
-            :full_path      => cluster_path(cluster, datacenter_name),
-            :num_host       => cluster.summary.numHosts,
-            :num_cpu_cores  => cluster.summary.numCpuCores,
+            :id => managed_obj_id(cluster),
+            :name => cluster.name,
+            :full_path => cluster_path(cluster, datacenter_name),
+            :num_host => cluster.summary.numHosts,
+            :num_cpu_cores => cluster.summary.numCpuCores,
             :overall_status => cluster.summary.overallStatus,
-            :datacenter     => datacenter_name || parent_attribute(cluster.path, :datacenter)[1],
+            :datacenter => datacenter_name || parent_attribute(cluster.path, :datacenter)[1]
           }
         end
 
         def cluster_path(cluster, datacenter_name)
           datacenter = find_raw_datacenter(datacenter_name)
-          cluster.pretty_path.gsub(/(#{Regexp.escape(datacenter_name)}|#{Regexp.escape(datacenter.hostFolder.name)})\//,'')
+          cluster.pretty_path.gsub(%r{(#{Regexp.escape(datacenter_name)}|#{Regexp.escape(datacenter.hostFolder.name)})\/}, '')
         end
       end
 
       class Mock
-        def list_clusters(filters = { })
+        def list_clusters(*)
           raw_clusters.map do |cluster|
             cluster
           end
         end
 
         def raw_clusters
-          folder = self.data[:clusters]
+          folder = data[:clusters]
           @raw_clusters = get_raw_clusters_from_folder(folder)
         end
 
         def get_raw_clusters_from_folder(folder)
           folder.map do |child|
-            if child[:klass] == "RbVmomi::VIM::ComputeResource"
-               child
-            elsif child[:klass] == "RbVmomi::VIM::Folder"
+            if child[:klass] == 'RbVmomi::VIM::ComputeResource'
+              child
+            elsif child[:klass] == 'RbVmomi::VIM::Folder'
               get_raw_clusters_from_folder(child[:clusters])
             end
           end.flatten

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

@@ -9,9 +9,11 @@ module Fog
           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)
+            unless compute_resource.instance_of? RbVmomi::VIM::Folder
+              summary = compute_resource.summary
+              next if only_active and summary.numEffectiveHosts == 0
+              compute_resource_attributes(compute_resource, datacenter_name)
+            end
           end.compact
         end
         
@@ -89,4 +91,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -175,6 +175,37 @@ module Fog
           virtual_machine_config_spec.memoryHotAddEnabled = options['memoryHotAddEnabled'] if ( options.key?('memoryHotAddEnabled') )
           virtual_machine_config_spec.firmware = options['firmware'] if ( options.key?('firmware') )
           virtual_machine_config_spec.extraConfig = extra_config(extra_config: options['extraConfig']) if ( options.key?('extraConfig') )
+          if @vsphere_rev.to_f >= 5 && options.key?('boot_order')
+            boot_order = options['boot_order'].flat_map do |boot_device|
+              case boot_device.to_sym
+              when :network
+                interfaces = device_change.select do |change|
+                  [:edit, :add].include?(change[:operation]) &&
+                    change[:device].class <= RbVmomi::VIM::VirtualEthernetCard
+                end.map { |change| change[:device] }
+                interfaces.map do |interface|
+                  RbVmomi::VIM::VirtualMachineBootOptionsBootableEthernetDevice.new(
+                    :deviceKey => interface.key
+                  )
+                end
+              when :disk
+                disks = device_change.select do |change|
+                  [:edit, :add].include?(change[:operation]) &&
+                    change[:device].is_a?(RbVmomi::VIM::VirtualDisk)
+                end.map { |change| change[:device] }
+                disks.map do |disk|
+                  RbVmomi::VIM::VirtualMachineBootOptionsBootableDiskDevice.new(
+                    :deviceKey => disk.key
+                  )
+                end
+              when :cdrom
+                RbVmomi::VIM::VirtualMachineBootOptionsBootableCdromDevice.new
+              when :floppy
+                RbVmomi::VIM::VirtualMachineBootOptionsBootableFloppyDevice.new
+              end
+            end
+            virtual_machine_config_spec.bootOptions = { :bootOrder => boot_order }
+          end
           # Options['customization_spec']
           # OLD Options still supported
           # * domain <~String> - *REQUIRED* - Sets the server's domain for customization
@@ -598,6 +629,7 @@ module Fog
               relocation_spec[:datastore] = datastore_obj
             end
           end
+          relocation_spec[:disk] = relocate_template_volumes_specs(vm_mob_ref, options['volumes'], options['datacenter'])
           # And the clone specification
           clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(:location => relocation_spec,
                                                             :config => virtual_machine_config_spec,
@@ -721,6 +753,8 @@ module Fog
             if new_nic
               backing = create_nic_backing(new_nic, {})
               template_nic.backing = backing
+              template_nic.addressType = 'generated'
+              template_nic.macAddress = nil
               connectable = RbVmomi::VIM::VirtualDeviceConnectInfo(
                 :allowGuestControl => true,
                 :connected => true,
@@ -768,6 +802,19 @@ module Fog
           specs.concat(new_volumes.map { |volume| create_disk(volume) })
           return specs
         end
+
+        def relocate_template_volumes_specs(vm_mob_ref, volumes, datacenter)
+          template_volumes = vm_mob_ref.config.hardware.device.grep(RbVmomi::VIM::VirtualDisk)
+          modified_volumes = volumes.take(template_volumes.size)
+
+          specs = []
+          template_volumes.zip(modified_volumes).each do |template_volume, new_volume|
+            if new_volume && new_volume.datastore != template_volume.backing.datastore.name
+              specs << { :diskId => new_volume.key, :datastore => get_raw_datastore(new_volume.datastore, datacenter) }
+            end
+          end
+          return specs
+        end
       end
 
       class Mock

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

@@ -16,9 +16,17 @@ module Fog
               "Could not find VirtualMachine with instance uuid #{options['instance_uuid']}"
           end
           options['host'] = get_raw_host(options['host'], options['cluster'], options['datacenter']) if options['host']
-          task = vm_mob_ref.MigrateVM_Task(:pool => options['pool'], :host => options['host'], :priority => "#{priority}", :state => options['state'] )
-          task.wait_for_completion
-          { 'task_state' => task.info.state }
+          task_options = {:pool => options['pool'], :host => options['host'], :state => options['state']}
+          if options['check']
+            checker = connection.serviceContent.vmProvisioningChecker
+            task = checker.CheckMigrate_Task(task_options.merge(:vm => vm_mob_ref))
+            task.wait_for_completion
+            {'error' => task.info.result[0].error, 'warning' => task.info.result[0].warning}
+          else
+            task = vm_mob_ref.MigrateVM_Task(task_options.merge(:priority => "#{priority}"))
+            task.wait_for_completion
+            { 'task_state' => task.info.state }
+          end
         end
       end
 

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

@@ -0,0 +1,54 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        # Clones a VM from a template or existing machine on your vSphere
+        # Server.
+        #
+        # ==== Parameters
+        # * options<~Hash>:
+        #   * 'instance_uuid'<~String> - *REQUIRED* VM to relocate
+        #   * 'host'<~String> - name of host which will run the VM.
+        #   * 'pool'<~String> - name of pool which the VM should be
+        #       attached.
+        #   * 'disks'<~Array> - disks to relocate. Each disk is a
+        #       hash with diskId wich is key attribute of volume,
+        #       and datastore to relocate to.
+        def vm_relocate(options = {})
+          raise ArgumentError, "instance_uuid is a required parameter" unless options.key? 'instance_uuid'
+
+          # Find the VM Object
+          search_filter = { :uuid => options['instance_uuid'], 'vmSearch' => true, 'instanceUuid' => true }
+          vm_mob_ref = connection.searchIndex.FindAllByUuid(search_filter).first
+
+          unless vm_mob_ref.kind_of? RbVmomi::VIM::VirtualMachine
+            raise Fog::Vsphere::Errors::NotFound,
+              "Could not find VirtualMachine with instance uuid #{options['instance_uuid']}"
+          end
+          options['host'] = get_raw_host(options['host'], options['cluster'], options['datacenter']) if options['host']
+          if options['disks']
+            options['disks'] = options['disks'].map do |disk|
+              disk['datastore'] = get_raw_datastore(disk['datastore'], nil)
+              RbVmomi::VIM::VirtualMachineRelocateSpecDiskLocator(disk)
+            end
+          end
+          spec = RbVmomi::VIM::VirtualMachineRelocateSpec(
+            :pool => options['pool'],
+            :host => options['host'],
+            :disk => options['disks']
+          )
+          task = vm_mob_ref.RelocateVM_Task(:spec => spec, :priority => options["priority"])
+          task.wait_for_completion
+          { 'task_state' => task.info.state }
+        end
+      end
+
+      class Mock
+        def vm_relocate(options = {})
+          raise ArgumentError, "instance_uuid is a required parameter" unless options.key? 'instance_uuid'
+          { 'task_state' => 'success' }
+        end
+      end
+    end
+  end
+end

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '1.12.0'.freeze
+    VERSION = '1.13.0'.freeze
   end
 end

data/tests/class_from_string_tests.rb

@@ -4,11 +4,11 @@ class A; class B; class C; end; end; end
 
 class TestClassFromString < Minitest::Test
   def test_empty_string
-    assert_equal(nil, Fog::Vsphere.class_from_string(''))
+    assert_nil(Fog::Vsphere.class_from_string(''))
   end
 
   def test_nil
-    assert_equal(nil, Fog::Vsphere.class_from_string(nil))
+    assert_nil(Fog::Vsphere.class_from_string(nil))
   end
 
   def test_name_as_class
@@ -20,7 +20,7 @@ class TestClassFromString < Minitest::Test
   end
 
   def test_unexpected_input
-    assert_equal(nil, Fog::Vsphere.class_from_string(8))
+    assert_nil(Fog::Vsphere.class_from_string(8))
   end
 
   def test_nested_class_without_default_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -254,6 +254,7 @@ files:
 - lib/fog/vsphere/requests/compute/vm_reconfig_hardware.rb
 - lib/fog/vsphere/requests/compute/vm_reconfig_memory.rb
 - lib/fog/vsphere/requests/compute/vm_reconfig_volumes.rb
+- lib/fog/vsphere/requests/compute/vm_relocate.rb
 - lib/fog/vsphere/requests/compute/vm_remove_snapshot.rb
 - lib/fog/vsphere/requests/compute/vm_rename.rb
 - lib/fog/vsphere/requests/compute/vm_revert_snapshot.rb