vmonkey 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db1974e7ea19c2601f95522a530c92ccbc99c467
-  data.tar.gz: e9fc72a7657ca1527ce6d97c4349d841d66b9d00
+  metadata.gz: 6449639ca5f21bba15a7f54c0bb88cd7789a9e7b
+  data.tar.gz: 4a863b9da03bff2db92c60385b7b7e4f8e52788d
 SHA512:
-  metadata.gz: 40055176c611003390d2568ef57d641e2b87dc53b9e7c3757885dcb2f8514e6225f1167e98688886ca723b0842ea72033431f3207d58e249e705eebc2b16709b
-  data.tar.gz: e961f6b59478ff4ee2a7bbc92832fe5c4c41c0352ff5d4a3d3445ee54c5813028fd2511efbd04617e8aee045a194e7dc4a38024b53417a5d9452dacd8e0cddf7
+  metadata.gz: a32c7a43c11902aacb9591c14213c6366e924435be4c07328f7543eead8ea78abe497424113352d7d1036f9f3accc08a58a0709e4d6d5cb0f6f4ef3a99d7d529
+  data.tar.gz: a2e2f99e45ae9c2271b14daf279fc7905ffe11d80d827af59c567d487492fdb69ae1836aeb96c20e92ff1af9367129530b1dc9f63725ef78d44b18f864128e38

data/lib/vmonkey/version.rb

@@ -1,3 +1,3 @@
 module Vmonkey
-  VERSION = '0.20.0'
+  VERSION = '0.21.0'
 end

data/lib/vmonkey/vim/VirtualMachine.rb

@@ -257,6 +257,7 @@ class RbVmomi::VIM::VirtualMachine
 
   def _clone_spec(dest, opts)
     opts[:config] ||= {}
+    opts[:vm_config_spec] ||= {}
 
     clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(
       location: RbVmomi::VIM.VirtualMachineRelocateSpec({
@@ -270,12 +271,23 @@ class RbVmomi::VIM::VirtualMachine
     device_change = opts[:deviceChange] || Array.new
     clone_spec.config = RbVmomi::VIM.VirtualMachineConfigSpec(deviceChange: device_change)
 
-    clone_spec.customization = monkey.customization_spec(opts[:customization_spec])
+    if opts[:customization_spec].is_a? String
+      clone_spec.customization = monkey.customization_spec(opts[:customization_spec])
+    else
+      clone_spec.customization = opts[:customization_spec]
+    end
+
     clone_spec.config.annotation = opts[:config][:annotation]
     clone_spec.config.numCPUs = opts[:config][:num_cpus]
     clone_spec.config.memoryMB = opts[:config][:memory_mb]
     clone_spec.config.files = opts[:config][:files]
 
+    #in the long run, this replaces the opts[:config] vals and just sets via the code below
+    opts[:vm_config_spec].each do |key, value|
+      setter = "#{key}=".to_sym
+      clone_spec.config.send(setter, value)
+    end
+
     clone_spec
   end
 

data/spec/virtualmachine_spec.rb

@@ -41,6 +41,10 @@ describe RbVmomi::VIM::VirtualMachine do
             @vm_path.basename,
             @monkey.get(@vm_path.parent),
             customization_spec: VM_SPEC_OPTS[:customization_spec],
+            vm_config_spec: {
+              guestId: 'rhel5_64Guest',
+              nestedHVEnabled: true
+            },
             config: {
               annotation: 'an annotation',
               num_cpus: 3,
@@ -55,6 +59,8 @@ describe RbVmomi::VIM::VirtualMachine do
       it { expect(subject[:spec].config.memoryMB).to eq 1024 }
       it { expect(subject[:spec].config.files[:vmPathName]). to eq "#{VM_SPEC_OPTS[:datastore]} vmonkey-test" }
       it { expect(subject[:spec].config.deviceChange.length).to be 0}
+      it { expect(subject[:spec].config.guestId).to eq 'rhel5_64Guest'}
+      it { expect(subject[:spec].config.nestedHVEnabled).to be true}
     end
 
     context 'with datastore change' do
@@ -269,4 +275,4 @@ describe RbVmomi::VIM::VirtualMachine do
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmonkey
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Brian Dupras
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri