knife-vsphere 0.1.5 → 0.1.6

data/lib/chef/knife/vsphere_vm_delete.rb

@@ -1,41 +1,39 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# License:: Apache License, Version 2.0
-#
-
-require 'chef/knife'
-require 'chef/knife/BaseVsphereCommand'
-require 'rbvmomi'
-
-# Delete a virtual machine from vCenter
-class Chef::Knife::VsphereVmDelete < Chef::Knife::BaseVsphereCommand
-
-  banner "knife vsphere vm delete VMNAME"
-
-  get_common_options
-  
-  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 = config[:vsphere_dc] || Chef::Config[:knife][:vsphere_dc]
-    dc = vim.serviceInstance.find_datacenter(dcname) or
-      fatal_exit("datacenter not found")
-
-    vm = find_in_folders(dc.vmFolder, RbVmomi::VIM::VirtualMachine, vmname) or
-      fatal_exit("VM #{vmname} not found")
-
-    vm.PowerOffVM_Task.wait_for_completion unless vm.runtime.powerState == "poweredOff"
-    vm.Destroy_Task
-    puts "Deleted virtual machine #{vmname}"
-
-  end
-end
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/BaseVsphereCommand'
+require 'rbvmomi'
+
+# Delete a virtual machine from vCenter
+class Chef::Knife::VsphereVmDelete < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere vm delete VMNAME"
+
+  get_common_options
+  
+  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
+
+    baseFolder = find_folder(config[:folder]);
+
+    vm = find_in_folder(baseFolder, RbVmomi::VIM::VirtualMachine, vmname) or
+      fatal_exit("VM #{vmname} not found")
+
+    vm.PowerOffVM_Task.wait_for_completion unless vm.runtime.powerState == "poweredOff"
+    vm.Destroy_Task
+    puts "Deleted virtual machine #{vmname}"
+
+  end
+end

data/lib/chef/knife/vsphere_vm_list.rb

@@ -1,42 +1,28 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# License:: Apache License, Version 2.0
-#
-require 'chef/knife'
-require 'chef/knife/BaseVsphereCommand'
-
-# Lists all known virtual machines in the configured datacenter
-class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
-
-  banner "knife vsphere vm list"
-
-  get_common_options
-  
-  option :folder,
-  :short => "-f SHOWFOLDER",
-  :long => "--folder",
-  :description => "The folder to list VMs in"
-
-  def run
-
-    $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"
-    
-    baseFolder = dc.vmFolder;
-
-    if config[:folder]
-      baseFolder = get_folders(dc.vmFolder).find { |f| f.name == config[:folder]} or
-        abort "no such folder #{config[:folder]}"
-    end
-
-    vms = find_all_in_folders(baseFolder, RbVmomi::VIM::VirtualMachine)      
-    vms.each do |vm|          
-      puts "#{ui.color("VM Name", :cyan)}: #{vm.name}"
-    end
-  end
-end
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# License:: Apache License, Version 2.0
+#
+require 'chef/knife'
+require 'chef/knife/BaseVsphereCommand'
+
+# Lists all known virtual machines in the configured datacenter
+class Chef::Knife::VsphereVmList < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere vm list"
+
+  get_common_options
+  
+  def run
+
+    $stdout.sync = true
+
+    vim = get_vim_connection
+
+    baseFolder = find_folder(config[:folder]);
+
+    vms = find_all_in_folder(baseFolder, RbVmomi::VIM::VirtualMachine)
+    vms.each do |vm|
+      puts "#{ui.color("VM Name", :cyan)}: #{vm.name}"
+    end
+  end
+end

data/lib/chef/knife/vsphere_vm_state.rb

@@ -1,89 +1,85 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# License:: Apache License, Version 2.0
-#
-
-require 'chef/knife'
-require 'chef/knife/BaseVsphereCommand'
-require 'rbvmomi'
-require 'netaddr'
-
-PsOn = 'poweredOn'
-PsOff = 'poweredOff'
-PsSuspended = 'suspended'
-
-PowerStates = {
-  PsOn => 'powered on',
-  PsOff => 'powered off',
-  PsSuspended => 'suspended'
-}
-
-# Manage power state of a virtual machine
-class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
-
-  banner "knife vsphere vm state VMNAME (options)"
-
-  get_common_options
-
-  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 = @name_args[0]
-    if vmname.nil?
-      show_usage
-      ui.fatal("You must specify a virtual machine name")
-      exit 1
-    end
-   
-    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
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/BaseVsphereCommand'
+require 'rbvmomi'
+require 'netaddr'
+
+PsOn = 'poweredOn'
+PsOff = 'poweredOff'
+PsSuspended = 'suspended'
+
+PowerStates = {
+  PsOn => 'powered on',
+  PsOff => 'powered off',
+  PsSuspended => 'suspended'
+}
+
+# Manage power state of a virtual machine
+class Chef::Knife::VsphereVmState < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere vm state VMNAME (options)"
+
+  get_common_options
+
+  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 = @name_args[0]
+    if vmname.nil?
+      show_usage
+      ui.fatal("You must specify a virtual machine name")
+      exit 1
+    end
+   
+    vim = get_vim_connection
+
+    baseFolder = find_folder(config[:folder]);
+
+    vm = find_in_folder(baseFolder, 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.5"
-end
-
+module KnifeVsphere
+  VERSION = "0.1.6"
+end
+

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: knife-vsphere
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Ezra Pagel
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 -05:00
+date: 2012-01-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
         version: 1.5.0
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 10
-        - 0
         version: 0.10.0
   type: :runtime
   version_requirements: *id002
@@ -58,11 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 2
-        - 3
         version: 1.2.3
   type: :runtime
   version_requirements: *id003
@@ -97,18 +77,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []