knife-vsphere 0.1.1 → 0.1.2

data/lib/chef/knife/VsphereBaseCommand.rb

@@ -100,6 +100,26 @@ class Chef
         vim = RbVmomi::VIM.connect conn_opts
         return vim
       end
+
+      def get_folders(folder)
+        folder.childEntity.grep(RbVmomi::VIM::Folder) << folder
+      end
+
+      def find_all_in_folders(folder, type)
+        get_folders(folder).
+          collect { |f| f.childEntity.grep(type) }.
+          flatten
+      end
+
+      def find_in_folders(folder, type, name)
+        get_folders(folder).
+          collect { |f| f.childEntity.grep(type) }.
+          flatten.
+          find { |o| o.name == name }
+      end
+
+     
+
     end
   end
 end

data/lib/chef/knife/vsphere_template_list.rb

@@ -34,16 +34,14 @@ class Chef
 
         dcname = config[:vsphere_dc] || Chef::Config[:knife][:vsphere_dc]
         dc = vim.serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-        vmFolder = dc.vmFolder
-        
-        vms = vmFolder.childEntity.grep(RbVmomi::VIM::VirtualMachine)
-        if (!vms.nil?)
-          templates = vms.find_all{ |v| !v.config.nil? && v.config.template == true }
-          if (!templates.nil?)
-            templates.each do |vm|          
-              puts "#{ui.color("Template Name", :cyan)}: #{vm.name}"
-            end
-          end
+                       
+        vmFolders = get_folders(dc.vmFolder)
+
+        vms = find_all_in_folders(dc.vmFolder, RbVmomi::VIM::VirtualMachine).
+          select {|v| !v.config.nil? && v.config.template == true }
+      
+        vms.each do |vm|          
+          puts "#{ui.color("Template Name", :cyan)}: #{vm.name}"
         end
       end
     end

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -44,16 +44,15 @@ class Chef
 
         dcname = config[:vsphere_dc] || Chef::Config[:knife][:vsphere_dc]
         dc = vim.serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-        vmFolder = dc.vmFolder
-        hosts = dc.hostFolder.children
+
+        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"
 
-        puts "searching for template #{template}"
-
-        src_vm = dc.find_vm(template) or abort "VM not found"
+        src_vm = find_in_folders(dc.vmFolder, RbVmomi::VIM::VirtualMachine, template) or
+          abort "VM/Template not found"
 
         rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => rp)
         spec = RbVmomi::VIM.VirtualMachineCloneSpec(:location => rspec,
@@ -66,6 +65,7 @@ class Chef
         puts "Finished creating virtual machine #{vmname}"
 
       end
+
     end
   end
 end

data/lib/chef/knife/vsphere_vm_delete.rb

@@ -22,6 +22,7 @@ class Chef
   class Knife
     class VsphereVmDelete < VsphereBaseCommand
 
+
       banner "knife vsphere vm delete (options)"
 
       get_common_options
@@ -42,7 +43,8 @@ class Chef
         dcname = config[:vsphere_dc] || Chef::Config[:knife][:vsphere_dc]
         dc = vim.serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
 
-        vm = dc.find_vm(vmname) or abort "VM not found"
+        vm = find_in_folders(dc.vmFolder, RbVmomi::VIM::VirtualMachine, vmname) or
+          abort "VM not found"
 
         vm.PowerOffVM_Task.wait_for_completion unless vm.runtime.powerState == "poweredOff"
         vm.UnregisterVM

data/lib/chef/knife/vsphere_vm_list.rb

@@ -1,5 +1,4 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
+#r# Author:: Ezra Pagel (<ezra@cpan.org>)
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,6 +24,10 @@ class Chef
 
       get_common_options
       
+      option :folder,
+      :short => "-f SHOWFOLDER",
+      :long => "--folder",
+      :description => "The folder to list VMs in"
 
       def run
 
@@ -32,12 +35,20 @@ class Chef
         
         vim = get_vim_connection
 
+
         dcname = config[:vsphere_dc] || Chef::Config[:knife][:vsphere_dc]
         dc = vim.serviceInstance.find_datacenter(dcname) or abort "datacenter not found"
-        vmFolder = dc.vmFolder
-        
-        vmFolder.childEntity.grep(RbVmomi::VIM::VirtualMachine).each do |vm|          
-          puts "#{ui.color("VM Name", :cyan)}: #{vm.name}"
+                       
+        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("Template Name", :cyan)}: #{vm.name}"
         end
       end
     end

data/lib/knife-vsphere/version.rb

@@ -1,4 +1,4 @@
 module KnifeVsphere
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: knife-vsphere
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ezra Pagel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 -05:00
+date: 2011-06-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,11 +59,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/chef/knife/#vsphere_vm_clone.rb#
 - lib/chef/knife/vsphere_template_list.rb
 - lib/chef/knife/vsphere_vm_clone.rb
 - lib/chef/knife/vsphere_vm_delete.rb
-- lib/chef/knife/vsphere_vm_delete.rb~
 - lib/chef/knife/vsphere_vm_list.rb
 - lib/chef/knife/VsphereBaseCommand.rb
 - lib/knife-vsphere/version.rb

data/lib/chef/knife/#vsphere_vm_clone.rb#

@@ -1,71 +0,0 @@
-V#
-# 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'
-
-class Chef
-  class Knife
-    class VsphereVmClone < VsphereBaseCommand
-
-      banner "knife vsphere vm clone (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"
-
-      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"
-        vmFolder = dc.vmFolder
-        hosts = dc.hostFolder.children
-        rp = hosts.first.resourcePool
-
-        template = config[:template] or abort "source template name required"
-        vmname = config[:vmname] or abort "destination vm name required"
-
-        puts "searching for template #{template}"
-
-        src_vm = dc.find_vm(template) or abort "VM not found"
-
-        rspec = RbVmomi::VIM.VirtualMachineRelocateSpec(:pool => rp)
-        spec = RbVmomi::VIM.VirtualMachineCloneSpec(:location => rspec,
-                                                    :powerOn => false,
-                                                    :template => false)
-
-        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}"
-
-      end
-    end
-  end
-end

data/lib/chef/knife/vsphere_vm_delete.rb~

@@ -1,54 +0,0 @@
-#
-# 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'
-
-class Chef
-  class Knife
-    class VsphereVmDelete < VsphereBaseCommand
-
-      banner "knife vsphere vm delete (options)"
-
-      get_common_options
-      
-      option :vmname,
-      :short => "-N VMNAME",
-      :long => "--vmname VMNAME",
-      :description => "The name of the virtual machine to delete"
-
-      def run
-
-        $stdout.sync = true
-        
-        vmname = config[:vmname] or abort "virtual machine 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"
-
-        vm = dc.find_vm(vmname) or abort "VM not found"
-
-        vm.PowerOffVM_Task.wait_for_completion
-        vm.UnregisterVM
-        puts "Finished unregistering virtual machine #{vmname}"
-
-      end
-    end
-  end
-end