knife-vsphere 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5c6db46d0b70790bceee7a18c1649d07e5880bd5
+  data.tar.gz: 75f42827a15800b4fef78a8f4db71205c86329c3
+SHA512:
+  metadata.gz: 5a90ce096ba9a99b1a943d6939aa21df37f7614092c4301f9fffb5ea8ee454567afb3ce555ea29a259b52a3e0ea3d8164e97931aa66ed989db9dce612bc97bdf
+  data.tar.gz: 5bc6f5f732f1f5bbca00a88d4a3f27f6f430b847ed33685294e6b32dad791e65e309ac4fc2c10dcf90e6b3dafe3a5cbfd6e506538ef19f8871d4ff1c2fefb63f

data/lib/chef/knife/base_vsphere_command.rb

@@ -6,6 +6,7 @@
 
 require 'chef/knife'
 require 'rbvmomi'
+require 'base64'
 
 # Base class for vsphere knife commands
 class Chef
@@ -101,10 +102,12 @@ class Chef
             :proxyPort => get_config(:proxy_port)
         }
 
-        # Grab the password from the command line
-        # if tt is not in the config file
-        if not conn_opts[:password]
+        if !conn_opts[:password]
+          # Password is not in the config file - grab it
+          # from the command line
           conn_opts[:password] = get_password
+        elsif conn_opts[:password].start_with?('base64:')
+          conn_opts[:password] = Base64.decode64(conn_opts[:password][7..-1]).chomp
         end
 
         #    opt :debug, "Log SOAP messages", :short => 'd', :default => (ENV['RBVMOMI_DEBUG'] || false)
@@ -204,7 +207,7 @@ class Chef
             if baseEntity.is_a? RbVmomi::VIM::Folder
               baseEntity = baseEntity.childEntity.find { |f| f.name == entityArrItem } or
                   abort "no such pool #{poolName} while looking for #{entityArrItem}"
-            elsif baseEntity.is_a? RbVmomi::VIM::ClusterComputeResource or baseEntity.is_a? RbVmomi::VIM::ComputeResource 
+            elsif baseEntity.is_a? RbVmomi::VIM::ClusterComputeResource or baseEntity.is_a? RbVmomi::VIM::ComputeResource
               baseEntity = baseEntity.resourcePool.resourcePool.find { |f| f.name == entityArrItem } or
                   abort "no such pool #{poolName} while looking for #{entityArrItem}"
             elsif baseEntity.is_a? RbVmomi::VIM::ResourcePool
@@ -273,7 +276,7 @@ class Chef
       end
 
       def find_datastorecluster(dsName, folder = nil)
-        if ! folder 
+        if ! folder
           dc = get_datacenter
           folder = dc.datastoreFolder
         end

data/lib/chef/knife/vsphere_folder_list.rb

@@ -1,30 +1,30 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# License:: Apache License, Version 2.0
-#
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-
-# Lists all vm folders
-class Chef::Knife::VsphereFolderList < Chef::Knife::BaseVsphereCommand
-
-  banner "knife vsphere folder list"
-
-  get_common_options
-
-  def traverse_folders(folder, indent_level)
-
-    puts "#{"  " * indent_level} #{ui.color("Folder", :cyan)}: " + folder.name
-
-    folders = find_all_in_folder(folder, RbVmomi::VIM::Folder)
-    folders.each do |child|
-      traverse_folders(child, indent_level  + 1)
-    end
-  end
-
-  def run
-    vim = get_vim_connection
-    baseFolder = find_folder(get_config(:folder));
-    traverse_folders(baseFolder, 0)
-  end
-end
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# License:: Apache License, Version 2.0
+#
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+
+# Lists all vm folders
+class Chef::Knife::VsphereFolderList < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere folder list"
+
+  get_common_options
+
+  def traverse_folders(folder, indent_level)
+
+    puts "#{"  " * indent_level} #{ui.color("Folder", :cyan)}: " + folder.name
+
+    folders = find_all_in_folder(folder, RbVmomi::VIM::Folder)
+    folders.each do |child|
+      traverse_folders(child, indent_level  + 1)
+    end
+  end
+
+  def run
+    vim = get_vim_connection
+    baseFolder = find_folder(get_config(:folder));
+    traverse_folders(baseFolder, 0)
+  end
+end

data/lib/chef/knife/vsphere_pool_list.rb

@@ -15,8 +15,10 @@ class Chef::Knife::VspherePoolList < Chef::Knife::BaseVsphereCommand
   def traverse_folders(folder)
     return if folder.is_a? RbVmomi::VIM::VirtualApp
 
-    puts "#{ui.color("Pool", :cyan)}: "+(folder.path[3..-1].map { |x| x[1] }.* '/') if
-      folder.is_a? RbVmomi::VIM::ResourcePool
+    if folder.is_a? RbVmomi::VIM::ResourcePool
+      pools = folder.path[3..-1].reject { |p| p.last == "Resources" }
+      puts "#{ui.color("Pool", :cyan)}: " + pools.map(&:last).join('/')
+    end
 
     folders = find_all_in_folder(folder, RbVmomi::VIM::ManagedObject) || []
     folders.each do |child|

data/lib/chef/knife/vsphere_template_list.rb

@@ -1,32 +1,32 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# License:: Apache License, Version 2.0
-#
-
-require 'chef/knife'
-require 'chef/knife/base_vsphere_command'
-
-# Lists all known VM templates in the configured datacenter
-class Chef::Knife::VsphereTemplateList < Chef::Knife::BaseVsphereCommand
-
-  banner "knife vsphere template list"
-
-  get_common_options
-
-  def run
-
-    $stdout.sync = true
-    $stderr.sync = true
-
-    vim = get_vim_connection
-
-    baseFolder = find_folder(get_config(:folder));
-
-    vms = find_all_in_folder(baseFolder, 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
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# License:: Apache License, Version 2.0
+#
+
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+
+# Lists all known VM templates in the configured datacenter
+class Chef::Knife::VsphereTemplateList < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere template list"
+
+  get_common_options
+
+  def run
+
+    $stdout.sync = true
+    $stderr.sync = true
+
+    vim = get_vim_connection
+
+    baseFolder = find_folder(get_config(:folder));
+
+    vms = find_all_in_folder(baseFolder, 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

@@ -74,8 +74,8 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
          :description => "String of data to pass to the plugin.  Use any format you wish."
 
   option :customization_vlan,
-         :long => "--cvlan CUST_VLAN",
-         :description => "VLAN name for network adapter to join"
+         :long => "--cvlan CUST_VLANS",
+         :description => "Comma-delimited list of VLAN names for network adapters to join"
 
   option :customization_ips,
          :long => "--cips CUST_IPS",
@@ -190,8 +190,8 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
   option :secret_file,
          :long => "--secret-file SECRET_FILE",
-         :description => "A file containing the secret key to use to encrypt data bag item values"
-  $default[:secret_file] = ''
+         :description => "A file containing the secret key to use to encrypt data bag item values",
+         :proc => lambda { |secret_file| Chef::Config[:knife][:secret_file] = secret_file }
 
   option :hint,
          :long => "--hint HINT_NAME[=HINT_FILE]",
@@ -379,18 +379,23 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     end
 
     if get_config(:customization_vlan)
-      network = find_network(get_config(:customization_vlan))
-      card = src_config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).first or
-          abort "Can't find source network card to customize"
-      begin
-        switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(:switchUuid => network.config.distributedVirtualSwitch.uuid, :portgroupKey => network.key)
-        card.backing.port = switch_port
-      rescue
-        # not connected to a distibuted switch?
-        card.backing = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(:network => network, :deviceName => network.name)
+      vlan_list = get_config(:customization_vlan).split(',')
+      networks = vlan_list.map { |vlan| find_network(vlan) }
+
+      cards = src_config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard)
+
+      networks.each_with_index do |network, index|
+        card = cards[index] or abort "Can't find source network card to customize for vlan #{vlan_list[index]}"
+        begin
+          switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(:switchUuid => network.config.distributedVirtualSwitch.uuid, :portgroupKey => network.key)
+          card.backing.port = switch_port
+        rescue
+          # not connected to a distibuted switch?
+          card.backing = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(:network => network, :deviceName => network.name)
+        end
+        dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => card, :operation => "edit")
+        clone_spec.config.deviceChange.push dev_spec
       end
-      dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => card, :operation => "edit")
-      clone_spec.config.deviceChange.push dev_spec
     end
 
     if get_config(:customization_spec)
@@ -495,15 +500,15 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   end
 
   # Generates a CustomizationAdapterMapping (currently only single IPv4 address) object
-  # @param ip [String] Any static IP address to use, otherwise DHCP
+  # @param ip [String] Any static IP address to use, or "dhcp" for 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
+    if ip.nil? || ip.downcase == "dhcp"
+      settings.ip = RbVmomi::VIM::CustomizationDhcpIpGenerator.new
     else
       cidr_ip = NetAddr::CIDR.create(ip)
       settings.ip = RbVmomi::VIM::CustomizationFixedIp(:ipAddress => cidr_ip.ip)

data/lib/chef/knife/vsphere_vm_list.rb

@@ -1,61 +1,61 @@
-#
-# Author:: Ezra Pagel (<ezra@cpan.org>)
-# 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::VsphereVmList < Chef::Knife::BaseVsphereCommand
-
-  banner "knife vsphere vm list"
-
-  get_common_options
-
-  option :recursive,
-         :long => "--recursive",
-         :short => "-r",
-         :description => "Recurse into sub-folders"
-
-  def traverse_folders(folder, is_top = false, recurse = false)
-
-    vms = find_all_in_folder(folder, RbVmomi::VIM::VirtualMachine).select {|v| v.config && !v.config.template }
-    if vms.any?
-      puts "#{ui.color("Folder", :cyan)}: "+(folder.path[3..-1].map { |x| x[1] }.* '/')
-      vms.each { |v|  print_vm(v) }
-    elsif is_top
-      puts "#{ui.color("No VMs", :cyan)}"
-    end
-
-    if (recurse)
-      folders = find_all_in_folder(folder, RbVmomi::VIM::Folder)
-      folders.each do |child|
-        traverse_folders(child, false, recurse)
-      end
-    end
-
-  end
-
-  def print_vm(vm)
-    state = case vm.runtime.powerState
-            when PsOn
-              ui.color("on", :green)
-            when PsOff
-              ui.color("off", :red)
-            when PsSuspended
-              ui.color("suspended", :yellow)
-            end
-    puts "\t#{ui.color("VM Name:", :cyan)} #{vm.name}"
-         "\t\t#{ui.color("IP:", :magenta)} #{vm.guest.ipAddress}"
-         "\t\t#{ui.color("RAM:", :magenta)} #{vm.summary.config.memorySizeMB}"
-         "\t\t#{ui.color("State:", :cyan)} #{state}"
-  end
-
-  def run
-    vim = get_vim_connection
-    baseFolder = find_folder(get_config(:folder));
-    recurse =  get_config(:recursive)
-    is_top = true
-    traverse_folders(baseFolder, is_top, recurse)
-  end
-end
+#
+# Author:: Ezra Pagel (<ezra@cpan.org>)
+# 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::VsphereVmList < Chef::Knife::BaseVsphereCommand
+
+  banner "knife vsphere vm list"
+
+  get_common_options
+
+  option :recursive,
+         :long => "--recursive",
+         :short => "-r",
+         :description => "Recurse into sub-folders"
+
+  def traverse_folders(folder, is_top = false, recurse = false)
+
+    vms = find_all_in_folder(folder, RbVmomi::VIM::VirtualMachine).select {|v| v.config && !v.config.template }
+    if vms.any?
+      puts "#{ui.color("Folder", :cyan)}: "+(folder.path[3..-1].map { |x| x[1] }.* '/')
+      vms.each { |v|  print_vm(v) }
+    elsif is_top
+      puts "#{ui.color("No VMs", :cyan)}"
+    end
+
+    if (recurse)
+      folders = find_all_in_folder(folder, RbVmomi::VIM::Folder)
+      folders.each do |child|
+        traverse_folders(child, false, recurse)
+      end
+    end
+
+  end
+
+  def print_vm(vm)
+    state = case vm.runtime.powerState
+            when PsOn
+              ui.color("on", :green)
+            when PsOff
+              ui.color("off", :red)
+            when PsSuspended
+              ui.color("suspended", :yellow)
+            end
+    puts "\t#{ui.color("VM Name:", :cyan)} #{vm.name}"
+         "\t\t#{ui.color("IP:", :magenta)} #{vm.guest.ipAddress}"
+         "\t\t#{ui.color("RAM:", :magenta)} #{vm.summary.config.memorySizeMB}"
+         "\t\t#{ui.color("State:", :cyan)} #{state}"
+  end
+
+  def run
+    vim = get_vim_connection
+    baseFolder = find_folder(get_config(:folder));
+    recurse =  get_config(:recursive)
+    is_top = true
+    traverse_folders(baseFolder, is_top, recurse)
+  end
+end

data/lib/knife-vsphere/version.rb

@@ -1,4 +1,4 @@
 module KnifeVsphere
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end
 

metadata

@@ -1,123 +1,105 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+    requirements: &1
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
+    requirements: *1
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    requirements: &2
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.10.0
+    requirements: *2
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+    requirements: &3
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.1
+    requirements: *3
 description: VMware vSphere Support for Chef's Knife Command
 email: ezra@cpan.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/chef/knife/vsphere_vm_query.rb
+- 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/vsphere_cpu_ratio.rb
+- lib/chef/knife/vsphere_customization_list.rb
+- lib/chef/knife/vsphere_datastore_list.rb
+- lib/chef/knife/vsphere_datastore_maxfree.rb
 - lib/chef/knife/vsphere_datastorecluster_list.rb
 - lib/chef/knife/vsphere_datastorecluster_maxfree.rb
-- lib/chef/knife/vshpere_vm_migrate.rb
-- lib/chef/knife/vsphere_vm_property_get.rb
-- lib/chef/knife/vsphere_vm_state.rb
-- lib/chef/knife/vshpere_vm_net.rb
-- lib/chef/knife/vsphere_vm_execute.rb
+- lib/chef/knife/vsphere_folder_list.rb
 - lib/chef/knife/vsphere_hosts_list.rb
-- lib/chef/knife/vsphere_vm_snapshot.rb
-- lib/chef/knife/vsphere_vm_toolsconfig.rb
-- lib/chef/knife/vsphere_vm_markastemplate.rb
-- lib/chef/knife/vsphere_vm_clone.rb
-- lib/chef/knife/base_vsphere_command.rb
-- lib/chef/knife/vsphere_vm_vmdk_add.rb
-- lib/chef/knife/vsphere_customization_list.rb
+- 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_vm_delete.rb
-- lib/chef/knife/vsphere_datastore_list.rb
-- lib/chef/knife/vsphere_vm_config.rb
 - lib/chef/knife/vsphere_vlan_list.rb
-- lib/chef/knife/vsphere_datastore_maxfree.rb
+- lib/chef/knife/vsphere_vm_clone.rb
+- lib/chef/knife/vsphere_vm_config.rb
+- lib/chef/knife/vsphere_vm_delete.rb
+- lib/chef/knife/vsphere_vm_execute.rb
 - lib/chef/knife/vsphere_vm_list.rb
-- lib/chef/knife/vsphere_pool_query.rb
-- lib/chef/knife/vshpere_vm_move.rb
-- lib/chef/knife/vsphere_pool_list.rb
-- lib/chef/knife/vsphere_folder_list.rb
+- lib/chef/knife/vsphere_vm_markastemplate.rb
+- lib/chef/knife/vsphere_vm_property_get.rb
 - lib/chef/knife/vsphere_vm_property_set.rb
+- lib/chef/knife/vsphere_vm_query.rb
+- lib/chef/knife/vsphere_vm_snapshot.rb
+- lib/chef/knife/vsphere_vm_state.rb
+- lib/chef/knife/vsphere_vm_toolsconfig.rb
+- lib/chef/knife/vsphere_vm_vmdk_add.rb
 - lib/knife-vsphere/version.rb
 homepage: http://github.com/ezrapagel/knife-vsphere
 licenses:
 - Apache
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - &4
+    - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  - *4
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: vSphere Support for Knife
 test_files: []