knife-vsphere 1.0.1 → 1.2.0

data/lib/chef/knife/vsphere_vm_wait_sysprep.rb

@@ -0,0 +1,54 @@
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# Contributor:: Malte Heidenreich (https://github.com/mheidenr)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+
+# Wait for vm finishing Sysprep.
+# usage:
+# knife vsphere vm wait sysprep somemachine --sleep 30 \
+#     --timeout 600
+class Chef::Knife::VsphereVmWaitSysprep < Chef::Knife::BaseVsphereCommand
+  include CustomizationHelper
+
+  banner 'knife vsphere vm wait sysprep VMNAME (options)'
+
+  common_options
+
+  option :sleep,
+         long: '--sleep TIME',
+         description: 'The time in seconds to wait between queries for CustomizationSucceeded event. Default: 60 seconds',
+         default: 60
+
+  option :timeout,
+         long: '--timeout TIME',
+         description: 'The timeout in seconds before aborting. Default: 300 seconds',
+         default: 300
+
+  def run
+    $stdout.sync = true
+
+    vmname = @name_args[0]
+    if vmname.nil?
+      show_usage
+      fatal_exit('You must specify a virtual machine name')
+    end
+
+    config[:vmname] = vmname
+
+    sleep_time = get_config(:sleep).to_i
+    sleep_timeout = get_config(:timeout).to_i
+
+    vim = get_vim_connection
+    dc = get_datacenter
+
+    folder = find_folder(get_config(:folder)) || dc.vmFolder
+    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM could not be found in #{folder}")
+
+    CustomizationHelper.wait_for_sysprep(vm, vim, sleep_timeout, sleep_time)
+  end
+end

data/lib/knife-vsphere/version.rb

@@ -1,4 +1,3 @@
-module KnifeVsphere
-  VERSION = "1.0.1"
-end
-
+module KnifeVsphere
+  VERSION = '1.2.0'
+end

metadata

@@ -1,48 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
   requirement: !ruby/object:Gem::Requirement
-    requirements: &1
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements: *1
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    requirements: &2
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements: *2
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
-    requirements: &3
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: knife-windows
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements: *3
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 description: VMware vSphere Support for Chef's Knife Command
 email: ezra@cpan.org
 executables: []
@@ -50,9 +73,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/chef/knife/base_vsphere_command.rb
-- lib/chef/knife/vshpere_vm_migrate.rb
-- lib/chef/knife/vshpere_vm_move.rb
-- lib/chef/knife/vshpere_vm_net.rb
+- lib/chef/knife/customization_helper.rb
+- lib/chef/knife/vsphere_cluster_list.rb
 - lib/chef/knife/vsphere_cpu_ratio.rb
 - lib/chef/knife/vsphere_customization_list.rb
 - lib/chef/knife/vsphere_datastore_list.rb
@@ -64,6 +86,7 @@ files:
 - lib/chef/knife/vsphere_pool_list.rb
 - lib/chef/knife/vsphere_pool_query.rb
 - lib/chef/knife/vsphere_template_list.rb
+- lib/chef/knife/vsphere_vlan_create.rb
 - lib/chef/knife/vsphere_vlan_list.rb
 - lib/chef/knife/vsphere_vm_clone.rb
 - lib/chef/knife/vsphere_vm_config.rb
@@ -71,6 +94,9 @@ files:
 - lib/chef/knife/vsphere_vm_execute.rb
 - lib/chef/knife/vsphere_vm_list.rb
 - lib/chef/knife/vsphere_vm_markastemplate.rb
+- lib/chef/knife/vsphere_vm_migrate.rb
+- lib/chef/knife/vsphere_vm_move.rb
+- lib/chef/knife/vsphere_vm_net.rb
 - lib/chef/knife/vsphere_vm_property_get.rb
 - lib/chef/knife/vsphere_vm_property_set.rb
 - lib/chef/knife/vsphere_vm_query.rb
@@ -78,6 +104,7 @@ files:
 - lib/chef/knife/vsphere_vm_state.rb
 - lib/chef/knife/vsphere_vm_toolsconfig.rb
 - lib/chef/knife/vsphere_vm_vmdk_add.rb
+- lib/chef/knife/vsphere_vm_wait_sysprep.rb
 - lib/knife-vsphere/version.rb
 homepage: http://github.com/ezrapagel/knife-vsphere
 licenses:
@@ -89,16 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - &4
-    - ">="
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - *4
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: vSphere Support for Knife

data/lib/chef/knife/vshpere_vm_migrate.rb

@@ -1,80 +0,0 @@
-#
-# Author:: Raducu Deaconu (<rhadoo_io@yahoo.com>)
-# License:: Apache License, Version 2.0
-#
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-
-# migrate vm to specified resource pool , datastore and host
-class Chef::Knife::VsphereVmMigrate < Chef::Knife::BaseVsphereCommand
-#migrate --resource-pool --dest-host --dest-datastore
-  banner "knife vsphere vm migrate (options)"
-
-  get_common_options
-
-  option :dest_host,
-         :long => "--dest-host HOST",
-         :description => "Destination host for the VM or template"
-
- option :dest_datastore,
-         :long => "--dest-datastore DATASTORE",
-         :description => "The destination datastore"
-
- option :priority,
-         :long => "--priority PRIORITY",
-         :description => "migration priority"
-
- option :resource_pool,
-          :long => "--resource-pool POOL",
-        :description => "The resource pool into which to put the VM"
-
-
-
-def traverse_folders_for_pool(folder, poolname)
-    children = folder.children.find_all
-    children.each do |child|
-      if child.class == RbVmomi::VIM::ClusterComputeResource || child.class == RbVmomi::VIM::ComputeResource || child.class == RbVmomi::VIM::ResourcePool
-        if child.name == poolname then return child end
-      elsif child.class == RbVmomi::VIM::Folder
-        pool = traverse_folders_for_pool(child, poolname)
-        if pool then return pool end
-      end
-    end
-    return false
-  end
-
-
-def find_host_folder(folder, type, name)
-folder.host.find { |o| o.name == name }
-end
-
-  def run
-    $stdout.sync = true
-    vmname = @name_args[0]
-    if vmname.nil?
-      show_usage
-      fatal_exit("You must specify a virtual machine name")
-    end
-
-    vim = get_vim_connection
-    dc=get_datacenter
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) or
-        abort "VM #{vmname} not found"
-
-
-priority=config[:priority]
-dest_host=config[:dest_host]
-ndc = find_datastore(config[:dest_datastore]) or abort "dest-datastore not found"
-npool=find_pool(config[:resource_pool])
-folderd = dc.hostFolder
-pool = traverse_folders_for_pool(folderd,config[:resource_pool] ) or abort "Pool #{poolname} not found"
-h=find_host_folder(pool, RbVmomi::VIM::HostSystem, dest_host)
-migrate_spec = RbVmomi::VIM.VirtualMachineRelocateSpec(:datastore => ndc,:pool => npool,:host=>h)
-#puts migrate_spec.host.name
-vm.RelocateVM_Task(:spec => migrate_spec,:priority=>priority).wait_for_completion
-
-
-  end
-end

data/lib/chef/knife/vshpere_vm_move.rb

@@ -1,92 +0,0 @@
-#
-# Author:: Brian Dupras (<bdupras@rallydev.com>)
-# License:: Apache License, Version 2.0
-#
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-
-# Lists all known virtual machines in the configured datacenter
-class Chef::Knife::VsphereVmMove < Chef::Knife::BaseVsphereCommand
-
-  banner "knife vsphere vm move"
-
-  get_common_options
-
-  option :dest_name,
-         :long => "--dest-name NAME",
-         :short => "-r",
-         :description => "Destination name of the VM or template"
-
-  option :dest_folder,
-         :long => "--dest-folder FOLDER",
-         :description => "The destination folder into which the VM or template should be moved"
-
-  option :datastore,
-         :long => "--datastore STORE",
-         :description => "The datastore into which to put the cloned VM"
-
-  option :thin_provision,
-         :long => "--thin-provision",
-         :description => "Indicates whether disk should be thin provisioned.",
-         :boolean => true
-
-  option :thick_provision,
-         :long => "--thick-provision",
-         :description => "Indicates whether disk should be thick provisioned.",
-         :boolean => true
-
-  # Convert VM
-  def convert_vm(vm)
-    rspec = nil
-    dc = get_datacenter
-    hosts = find_all_in_folder(dc.hostFolder, RbVmomi::VIM::ComputeResource)
-    rp = hosts.first.resourcePool
-    rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => rp)
-
-    if get_config(:thin_provision)
-      puts "Thin provsisioning #{vm.name}"
-      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:datastore => find_datastore(get_config(:datastore)), :transform => :sparse)
-    end
-
-    if get_config(:thick_provision)
-      puts "Thick provsisioning #{vm.name}"
-      rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:datastore => find_datastore(get_config(:datastore)), :transform => :flat)
-    end
-
-    task = vm.RelocateVM_Task(:spec => rspec)
-    task.wait_for_completion
-  end
-
-  # Move VM
-  def move_vm(vm)
-    dest_name = config[:dest_name] || vmname
-    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
-  end
-
-  def run
-    $stdout.sync = true
-    vmname = @name_args[0]
-    if vmname.nil?
-      show_usage
-      fatal_exit("You must specify a virtual machine name")
-    end
-
-    vim = get_vim_connection
-    dcname = get_config(:vsphere_dc)
-    dc = vim.serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-    folder = find_folder(get_config(:folder)) || dc.vmFolder
-
-    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) or
-        abort "VM #{vmname} not found"
-
-    if get_config(:thin_provision) || get_config(:thick_provision)
-      convert_vm(vm)
-    else
-      move_vm(vm)
-    end
-  end
-end
-

data/lib/chef/knife/vshpere_vm_net.rb

@@ -1,57 +0,0 @@
-#
-# Author:: Raducu Deaconu (<rhadoo_io@yahoo.com>)
-# License:: Apache License, Version 2.0
-#
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-# Switch VM networking state up/down (on all network interfaces)
-class Chef::Knife::VsphereVmNet < Chef::Knife::BaseVsphereCommand
-  banner "knife vsphere vm net STATE VMNAME"
-  get_common_options
-  def run
-    $stdout.sync = true
-    vmname = @name_args[1]
-    if vmname.nil?
-      show_usage
-      fatal_exit("You must specify a virtual machine name")
-    end
-
-state = @name_args[0]
-    if state.nil?
-      show_usage
-      fatal_exit("You must specify networking state up/down")
-    end
-
-if state=="up"
-if_state=true
-elsif state=="down"
-if_state=false
-end
-vim = get_vim_connection
-dc=get_datacenter
-folder = find_folder(get_config(:folder)) || dc.vmFolder
-vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) or
-abort "VM #{vmname} not found"
-vm.config.hardware.device.each.grep(RbVmomi::VIM::VirtualEthernetCard) do |a|
-backing=a.backing
-key= a.key
-
-puts "#{ui.color("Setting network adapter", :cyan)} :#{a.deviceInfo.label} on vlan :#{a.deviceInfo.summary} :#{state}"
-
-conninfo=RbVmomi::VIM.VirtualDeviceConnectInfo(:startConnected => true,
-                                               :allowGuestControl => true,
-                                               :connected => if_state)
-
-ndevice = RbVmomi::VIM.VirtualE1000(:key => key,
-                                    :backing => backing,
-                                    :connectable => conninfo)
-
-device_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:operation => :edit,
-                                                   :device => ndevice)
-
-vmspec = RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange =>[device_spec])
-
-vm.ReconfigVM_Task(:spec => vmspec).wait_for_completion
-end
-end
-end