knife-vsphere 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1ace6fae44de22b6372e167868b2e3710019f59
-  data.tar.gz: 3073721416e47f816a9da1b73570a8625cb9149b
+  metadata.gz: 6e85bab504b011a44e58f635248bc9603285665b
+  data.tar.gz: 45a6bea0b1737a6af5a09d692ce195d560a32ccc
 SHA512:
-  metadata.gz: 18b0c95d0f67588d8f103c27f3ce83be4f9e5ddebb393fb20609bcd2fe016710d5a15265e2ad3eaab3a3ab62fb7b2686b82eb4072107ccda8febf69168c8b3b9
-  data.tar.gz: cce7f5a115fd16d2d1476a78b03edc932c46acf58a68641bdabbacc2d7d0cfdb0bacf3cd83215ab97f36e19b358729996d1e58957fdfa05e89ba047a620c187a
+  metadata.gz: e7569807caee36f7cc4c36cec71f2d668c6fcc4f6a1ac865ef79869a6333cd8b70288dc9f0324c60dbe0999a7fc61d00784c70213b51be6e606b5702ba672f67
+  data.tar.gz: 950c30592dbeca0397b08b4902b1a558bfa0f508dc977faa624f1fdded2bd3e32465a920e6674b7088c7945ae2cae8653e7d3b6cee90f6604ccc8a7ef2d5941a

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -558,8 +558,9 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
             fullName: cust_spec.identity.userData.fullName,
             orgName: cust_spec.identity.userData.orgName,
             productId: cust_spec.identity.userData.productId,
-            computerName: cust_spec.identity.userData.computerName
+            computerName: RbVmomi::VIM.CustomizationFixedName(name: hostname)
           )
+
           gui_unattended = RbVmomi::VIM.CustomizationGuiUnattended(
             autoLogon: cust_spec.identity.guiUnattended.autoLogon,
             autoLogonCount: cust_spec.identity.guiUnattended.autoLogonCount,

data/lib/chef/knife/vsphere_vm_move.rb

@@ -57,11 +57,11 @@ class Chef::Knife::VsphereVmMove < Chef::Knife::BaseVsphereCommand
 
   # Move VM
   def move_vm(vm)
-    dest_name = config[:dest_name] || vmname
+    dest_name = config[:dest_name] || vm.name
     dest_folder = config[:dest_folder].nil? ? (vm.parent) : (find_folder(get_config(:dest_folder)))
 
-    vm.Rename_Task(newName: dest_name).wait_for_completion unless vmname == dest_name
-    dest_folder.MoveIntoFolder_Task(list: [vm]).wait_for_completion unless folder == dest_folder
+    vm.Rename_Task(newName: dest_name).wait_for_completion unless vm.name == dest_name
+    dest_folder.MoveIntoFolder_Task(list: [vm]).wait_for_completion unless vm.parent == dest_folder
   end
 
   def run
@@ -84,5 +84,7 @@ class Chef::Knife::VsphereVmMove < Chef::Knife::BaseVsphereCommand
     else
       move_vm(vm)
     end
+
+    puts "VM #{vm.name} moved successfully"
   end
 end

data/lib/chef/knife/vsphere_vm_snapshot.rb

@@ -44,6 +44,19 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
          description: 'Indicates whether to wait for creation/removal to complete',
          boolean: false
 
+  option :find,
+         long: '--find',
+         description: 'Finds the virtual machine by searching all folders'
+
+  option :dump_memory,
+         long: '--dump-memory',
+         description: 'Dump the memory in the snapshot',
+         default: false
+
+  option :quiesce,
+         long: '--quiesce',
+         description: 'Quiesce the VM prior to snapshotting',
+         default: false
 
   def run
     $stdout.sync = true
@@ -57,37 +70,45 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
 
     vim_connection
 
-    base_folder = find_folder(get_config(:folder))
-
-    vm = find_in_folder(base_folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM #{vmname} not found")
+    vm = if get_config(:find)
+           puts "No folder entered, searching for #{vmname}"
+           src_folder = find_folder(get_config(:folder))
+           traverse_folders_for_vm(src_folder, vmname)
+         else
+           base_folder = find_folder get_config(:folder)
+           find_in_folder(base_folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM #{vmname} not found")
+         end
 
     if vm.snapshot
       snapshot_list = vm.snapshot.rootSnapshotList
       current_snapshot = vm.snapshot.currentSnapshot
     end
 
-    if config[:list] && vm.snapshot
+    if get_config(:list) && vm.snapshot
       puts 'Current snapshot tree: '
       puts "#{vmname}"
       snapshot_list.each { |i| puts display_node(i, current_snapshot) }
     end
 
-    if config[:create_new_snapshot]
-      snapshot_task=vm.CreateSnapshot_Task(name: config[:create_new_snapshot], description: '', memory: false, quiesce: false)
-      snapshot_task=snapshot_task.wait_for_completion if config[:wait]
+    if get_config(:create_new_snapshot)
+      snapshot_task = vm.CreateSnapshot_Task(name: get_config(:create_new_snapshot),
+                                             description: '',
+                                             memory: get_config(:dump_memory),
+                                             quiesce: get_config(:quiesce))
+      snapshot_task = snapshot_task.wait_for_completion if get_config(:wait)
       snapshot_task
     end
 
-    if config[:remove_named_snapshot]
-      ss_name = config[:remove_named_snapshot]
+    if get_config(:remove_named_snapshot)
+      ss_name = get_config(:remove_named_snapshot)
       snapshot = find_node(snapshot_list, ss_name)
       puts "Found snapshot #{ss_name} removing."
-      snapshot_task=snapshot.RemoveSnapshot_Task(removeChildren: false)
-      snapshot_task=snapshot_task.wait_for_completion if config[:wait]
+      snapshot_task = snapshot.RemoveSnapshot_Task(removeChildren: false)
+      snapshot_task = snapshot_task.wait_for_completion if get_config(:wait)
       snapshot_task
     end
 
-    if config[:revert_current_snapshot]
+    if get_config(:revert_current_snapshot)
       puts 'Reverting to Current Snapshot'
       vm.RevertToCurrentSnapshot_Task(suppressPowerOn: false).wait_for_completion
       if get_config(:power)
@@ -96,8 +117,8 @@ class Chef::Knife::VsphereVmSnapshot < Chef::Knife::BaseVsphereCommand
       end
     end
 
-    return unless config[:revert_snapshot]
-    ss_name = config[:revert_snapshot]
+    return unless get_config(:revert_snapshot)
+    ss_name = get_config(:revert_snapshot)
     snapshot = find_node(snapshot_list, ss_name)
     snapshot.RevertToSnapshot_Task(suppressPowerOn: false).wait_for_completion
     return unless get_config(:power)

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.7'
+  VERSION = '1.2.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize