knife-vsphere 1.2.23 → 1.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f8cb1ebf7619c1b5f50c38e109f45783b4fc361
-  data.tar.gz: 2270f974a260ad9beb73df5a9f6669ba86ab5678
+  metadata.gz: f337711fde662bcc17ea7c1823901e43b83d621a
+  data.tar.gz: c3ee25e483b12d539d2bfd4c73325745290fc7a9
 SHA512:
-  metadata.gz: e0cab5972517ffbc472360ec3a020a2509a4b6b7f8283fef983392183fe1f4b37f46cb4c08268e28a929d9ba1bbf21ae6aaff484e179026538638f437c8cf17c
-  data.tar.gz: e747062b1748bb489b68b1bd5405bba33ac9a0649f6a9de9ffcc7368ec47ac2ab877f65f3822762a7b36fead4a74707503cee64f56dfb41bbf117a24130e133b
+  metadata.gz: 6bcb197a0f9624ddf6d044b6a4cff1adda83a09159765c7658b5c4f2ae024d54c208308b4bc378d37d37c0c539403a04389bb49510ecd9fc8e5c05aa55f835d3
+  data.tar.gz: 80ef8bba00005ead0e01fd1956e1b501bc7018218cb3297cb6e5836da2baa8e0483b7ea21f34a6865983d30e290e0f13bbf1da61c7f98daad17c2719cfa0cafa

data/lib/chef/knife/base_vsphere_command.rb

@@ -223,10 +223,21 @@ class Chef
         base_entity
       end
 
-      def find_network(networkName)
+      def find_network(networkName, dvswitch = nil)
         dc = datacenter
         base_entity = dc.network
-        base_entity.find { |f| f.name == networkName } || abort("no such network #{networkName}")
+
+        networks = base_entity.select { |f| f.name == networkName }
+        abort("no such network #{networkName}") if networks.empty?
+
+        if dvswitch && dvswitch != 'auto'
+          return networks.find do |f|
+            sw = f.config.distributedVirtualSwitch
+            sw.uuid == dvswitch || sw.name == dvswitch
+          end
+        end
+
+        networks.first
       end
 
       def find_pool(poolName)

data/lib/chef/knife/vsphere_datastore_list.rb

@@ -43,8 +43,7 @@ class Chef::Knife::VsphereDatastoreList < Chef::Knife::BaseVsphereCommand
 
     pools = find_pools_and_clusters(folder, target_pool)
     if target_pool && pools.empty?
-      puts "Pool #{target_pool} not found"
-      return
+      fatal_exit("Pool #{target_pool} not found")
     end
 
     pool_info = pools.map do |pool|

data/lib/chef/knife/vsphere_datastore_maxfree.rb

@@ -32,27 +32,40 @@ class Chef::Knife::VsphereDatastoreMaxfree < Chef::Knife::BaseVsphereCommand
          long: '--vlan VLAN',
          description: 'Require listed vlan available to datastore\'s parent'
 
+  option :pool,
+         long: '--pool pool',
+         description: 'Pool or Cluster to search for datastores in'
+
   common_options
 
   def run
     $stdout.sync = true
+    if get_config(:vlan) && get_config(:pool)
+      fatal_exit('Please select either vlan or pool')
+    end
 
     vim_connection
-    dcname = get_config(:vsphere_dc)
     regex = /#{get_config(:regex)}/
-    dc = config[:vim].serviceInstance.find_datacenter(dcname) || abort('datacenter not found')
     max = nil
-    datastores = if get_config(:vlan)
-                   find_network(get_config(:vlan)).host.map(&:datastore).flatten
-                 else
-                   dc.datastore
-                 end
+    datastores = find_datastores
     datastores.each do |store|
       if regex.match(store.name) &&
          (max.nil? || max.summary[:freeSpace] < store.summary[:freeSpace])
         max = store
       end
     end
-    puts max ? max.name : ''
+    ui.output(max ? { 'Datastore' => max.name } : {})
+  end
+end
+
+private
+
+def find_datastores
+  if get_config(:vlan)
+    find_network(get_config(:vlan)).host.map(&:datastore).flatten
+  elsif get_config(:pool)
+    find_pools_and_clusters(datacenter.hostFolder, get_config(:pool)).map(&:datastore).flatten
+  else
+    datacenter.datastore
   end
 end

data/lib/chef/knife/vsphere_hosts_list.rb

@@ -22,8 +22,7 @@ class Chef::Knife::VsphereHostsList < Chef::Knife::BaseVsphereCommand
 
     pools = find_pools_and_clusters(folder, target_pool)
     if target_pool && pools.empty?
-      puts "Pool #{target_pool} not found"
-      return
+      fatal_exit("Pool #{target_pool} not found")
     end
 
     pool_list = pools.map do |pool|

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -597,7 +597,8 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
 
     if get_config(:customization_vlan)
       vlan_list = get_config(:customization_vlan).split(',')
-      networks = vlan_list.map { |vlan| find_network(vlan) }
+      sw_uuid   = get_config(:customization_sw_uuid)
+      networks  = vlan_list.map { |vlan| find_network(vlan, sw_uuid) }
 
       cards = src_config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard)
 

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.23'
+  VERSION = '1.2.24'
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.23
+  version: 1.2.24
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: netaddr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
     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: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: VMware vSphere Support for Chef's Knife Command
@@ -184,17 +184,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: vSphere Support for Knife