knife-vsphere 0.1.3 → 0.1.4

data/lib/chef/knife/VsphereBaseCommand.rb

@@ -55,21 +55,18 @@ class Chef
       :description => "The Datacenter to create the VM in"
       
       option :path,
-      :short => "-P SOAP_PATH",
       :long => "--path SOAP_PATH",
       :description => "The SOAP endpoint path",
       :proc => Proc.new { |p| Chef::Config[:knife][:path] = p },
       :default => "/sdk"
 
       option :port,
-      :short => "-p PORT",
       :long => "--port PORT",
       :description => "The VI SDK port number to use",
       :proc => Proc.new { |p| Chef::Config[:knife][:port] = p },
       :default => 443
 
       option :use_ssl,
-      :short => "-s USE_SSL",
       :long => "--ssl USE_SSL",
       :description => "Whether to use SSL connection",
       :default => true

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -17,73 +17,117 @@
 require 'chef/knife'
 require 'chef/knife/VsphereBaseCommand'
 require 'rbvmomi'
+require 'netaddr'
 
-class Chef
-  class Knife
-    class VsphereVmClone < VsphereBaseCommand
+class Chef::Knife::VsphereVmClone < Chef::Knife::VsphereBaseCommand
 
-      banner "knife vsphere vm clone (options)"
+  banner "knife vsphere vm clone (options)"
 
-      get_common_options
+  get_common_options
 
-      option :template,
-      :short => "-t TEMPLATE",
-      :long => "--template TEMPLATE",
-      :description => "The template to create the VM from"
-      
-      option :vmname,
-      :short => "-N VMNAME",
-      :long => "--vmname VMNAME",
-      :description => "The name for the new virtual machine"
+  option :template,
+  :short => "-t TEMPLATE",
+  :long => "--template TEMPLATE",
+  :description => "The template to create the VM from"
+  
+  option :vmname,
+  :short => "-N VMNAME",
+  :long => "--vmname VMNAME",
+  :description => "The name for the new virtual machine"
 
-      option :customization_spec,
-      :long => "--cspec CUSTOMIZATION_SPEC",
-      :description => "The name of any customization specification to apply"
+  option :customization_spec,
+  :long => "--cspec CUSTOMIZATION_SPEC",
+  :description => "The name of any customization specification to apply"
 
-      def run
+  option :customization_ips,
+  :long => "--cips CUSTOMIZATION_IPS",
+  :description => "A comma-delimited list of CIDR notation static IPs to be mapped in order for "+
+    "any applied customization specification that expects IP addresses"
 
-        $stdout.sync = true
-        
-        vim = get_vim_connection
 
-        dcname = config[:vsphere_dc] || Chef::Config[:knife][:vsphere_dc]
-        dc = vim.serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
 
-        hosts = find_all_in_folders(dc.hostFolder, RbVmomi::VIM::ComputeResource)
-        rp = hosts.first.resourcePool
 
-        template = config[:template] or abort "source template name required"
-        vmname = config[:vmname] or abort "destination vm name required"
+  def run
+  
+    $stdout.sync = true
 
-        src_vm = find_in_folders(dc.vmFolder, RbVmomi::VIM::VirtualMachine, template) or
-          abort "VM/Template not found"
+    template = config[:template] or abort "source template name required"
+    vmname = config[:vmname] or abort "destination vm name required"
+    
+    vim = get_vim_connection
 
-        rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => rp)
+    dcname = config[:vsphere_dc] || Chef::Config[:knife][:vsphere_dc]
+    dc = vim.serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
 
-  
-        spec = RbVmomi::VIM.VirtualMachineCloneSpec(:location => rspec,
-                                                    :powerOn => false,
-                                                    :template => false)
+    hosts = find_all_in_folders(dc.hostFolder, RbVmomi::VIM::ComputeResource)
+    rp = hosts.first.resourcePool
 
-        if config[:customization_spec]
-          cs = find_customization(vim, config[:customization_spec]) or
-            abort "failed to find customization specification named #{config[:customization_spec]}"
-          spec.customization = cs.spec
-        end
+    src_vm = find_in_folders(dc.vmFolder, RbVmomi::VIM::VirtualMachine, template) or
+      abort "VM/Template not found"
 
-        task = src_vm.CloneVM_Task(:folder => src_vm.parent, :name => vmname, :spec => spec)
-        puts "Cloning template #{template} to new VM #{vmname}"
-        task.wait_for_completion        
-        puts "Finished creating virtual machine #{vmname}"
+    rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => rp)
 
-      end
+    
+    clone_spec = RbVmomi::VIM.VirtualMachineCloneSpec(:location => rspec,
+                                                      :powerOn => false,
+                                                      :template => false)
 
-      def find_customization(vim, name) 
-        csm = vim.serviceContent.customizationSpecManager
-        csm.GetCustomizationSpec(:name => name) 
+    if config[:customization_spec]
+      csi = find_customization(vim, config[:customization_spec]) or
+        abort "failed to find customization specification named #{config[:customization_spec]}"
+
+      if config[:customization_ips]
+        csi.spec.nicSettingMap = config[:customization_ips].split(',').map { |i| generate_adapter_map(i) }
       end
 
+      clone_spec.customization = csi.spec
+
+    end
+
+    task = src_vm.CloneVM_Task(:folder => src_vm.parent, :name => vmname, :spec => clone_spec)
+    puts "Cloning template #{template} to new VM #{vmname}"
+    task.wait_for_completion        
+    puts "Finished creating virtual machine #{vmname}"
+  end
+  
 
+  # Retrieves a CustomizationSpecItem that matches the supplied name
+  # @param vim [Connection] VI Connection to use
+  # @param name [String] name of customization
+  # @return [RbVmomi::VIM::CustomizationSpecItem]
+  def find_customization(vim, name) 
+    csm = vim.serviceContent.customizationSpecManager
+    csm.GetCustomizationSpec(:name => name) 
+  end
+  
+  # Generates a CustomizationAdapterMapping (currently only single IPv4 address) object
+  # @param ip [String] Any static IP address to use, otherwise DHCP
+  # @param gw [String] If static, the gateway for the interface, otherwise network address + 1 will be used
+  # @return [RbVmomi::VIM::CustomizationIPSettings]
+  def generate_adapter_map (ip=nil, gw=nil, dns1=nil, dns2=nil, domain=nil)
+           
+    settings = RbVmomi::VIM.CustomizationIPSettings
+
+    if ip.nil?
+      settings.ip = RbVmomi::VIM::CustomizationDhcpIpGenerator
+    else
+      cidr_ip = NetAddr::CIDR.create(ip)
+      settings.ip = RbVmomi::VIM::CustomizationFixedIp(:ipAddress => cidr_ip.ip)
+      settings.subnetMask = cidr_ip.netmask_ext
+
+      # TODO - want to confirm gw/ip are in same subnet?
+      if [gw.nil?]
+        settings.gateway = [cidr_ip.network(:Objectify => true).next_ip]
+      else
+        gw_cidr = NetAddr::CIDR.create(gw)
+        settings.gateway = [gw_cidr.ip]
+      end
     end
+    
+    adapter_map = RbVmomi::VIM.CustomizationAdapterMapping
+    adapter_map.adapter = settings
+    adapter_map
+    #end
   end
+  
 end

data/lib/chef/knife/vsphere_vm_delete.rb

@@ -44,11 +44,11 @@ class Chef
         dc = vim.serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
 
         vm = find_in_folders(dc.vmFolder, RbVmomi::VIM::VirtualMachine, vmname) or
-          abort "VM not found"
+          abort "VM #{vmname} not found"
 
         vm.PowerOffVM_Task.wait_for_completion unless vm.runtime.powerState == "poweredOff"
-        vm.UnregisterVM
-        puts "Finished unregistering virtual machine #{vmname}"
+        vm.Destroy_Task
+        puts "Deleted virtual machine #{vmname}"
 
       end
     end

data/lib/chef/knife/vsphere_vm_state.rb

@@ -0,0 +1,99 @@
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'chef/knife'
+require 'chef/knife/VsphereBaseCommand'
+require 'rbvmomi'
+require 'netaddr'
+
+PsOn = 'poweredOn'
+PsOff = 'poweredOff'
+PsSuspended = 'suspended'
+
+PowerStates = {
+  PsOn => 'powered on',
+  PsOff => 'powered off',
+  PsSuspended => 'suspended'
+}
+
+class Chef::Knife::VsphereVmState < Chef::Knife::VsphereBaseCommand
+
+  banner "knife vsphere vm state (options)"
+
+  get_common_options
+
+  option :vmname,
+  :short => "-N VMNAME",
+  :long => "--vmname VMNAME",
+  :description => "The name for the new virtual machine"
+
+  option :state,
+  :short => "-s STATE",
+  :long => "--state STATE",
+  :description => "The power state to transition the VM into; one of on|off|suspended"
+
+  def run
+  
+    $stdout.sync = true
+
+    vmname = config[:vmname] or abort "destination vm name required"
+   
+    vim = get_vim_connection
+
+    dcname = config[:vsphere_dc] || Chef::Config[:knife][:vsphere_dc]
+    dc = vim.serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
+
+    hosts = find_all_in_folders(dc.hostFolder, RbVmomi::VIM::ComputeResource)
+    rp = hosts.first.resourcePool
+
+    vm = find_in_folders(dc.vmFolder, RbVmomi::VIM::VirtualMachine, vmname) or
+      abort "VM #{vmname} not found"
+
+    state = vm.runtime.powerState
+
+    if config[:state].nil?
+      puts "VM #{vmname} is currently " + PowerStates[vm.runtime.powerState]
+    else
+
+      case config[:state]
+      when 'on'
+        if state == PsOn
+          puts "Virtual machine #{vmname} was already powered on"
+        else
+          vm.PowerOnVM_Task.wait_for_completion
+          puts "Powered on virtual machine #{vmname}"
+        end
+      when 'off'
+        if state == PsOff
+          puts "Virtual machine #{vmname} was already powered off"
+        else
+          vm.PowerOffVM_Task.wait_for_completion
+          puts "Powered off virtual machine #{vmname}"
+        end
+      when 'suspend'
+        if state == PowerStates['suspended']
+          puts "Virtual machine #{vmname} was already suspended"
+        else
+          vm.SuspendVM_Task.wait_for_completion
+          puts "Suspended virtual machine #{vmname}"
+        end
+      when 'reset'
+        vm.ResetVM_Task.wait_for_completion
+        puts "Reset virtual machine #{vmname}"
+      end
+    end
+  end
+end

data/lib/knife-vsphere/version.rb

@@ -1,4 +1,4 @@
 module KnifeVsphere
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: knife-vsphere
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Ezra Pagel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 -05:00
+date: 2011-07-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ files:
 - lib/chef/knife/vsphere_vm_clone.rb
 - lib/chef/knife/vsphere_vm_delete.rb
 - lib/chef/knife/vsphere_vm_list.rb
+- lib/chef/knife/vsphere_vm_state.rb
 - lib/chef/knife/VsphereBaseCommand.rb
 - lib/knife-vsphere/version.rb
 has_rdoc: true