knife-vsphere 1.2.11 → 1.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 041173b0bb8d4791d22c9834ff1759992ef9143f
-  data.tar.gz: 2ab04c24568487e1a624bbed1338faef8f5b219b
+  metadata.gz: 8c9f4f89524d9eb9369efb020a0973a599cb4f00
+  data.tar.gz: 8eaafefad58bb40dc078adf77788bf0f4f890c08
 SHA512:
-  metadata.gz: c08fffec7d372bc2f5011d1d9aef0e4cf83d01a9976eae560fc8b196430379e75f7c765047127fb325dcd54b30738aeb5dcbb4a1d6cf8513f50792a35e458adf
-  data.tar.gz: 7f8323b13c044d45b9ad926fa1626d2f12efcc1f48a3aaa7e31a612b98049942115a03c41ba507dbbec9557fc752148ea1e520f1f7eb5a54a82daba67f59273b
+  metadata.gz: e388e12fea69231ef285d14065784c4160c261b02764f97d24bd96c5637f5c5ba2fd6942b0db18892f3c9503b4593e409472c9859ab8ada4b0b8fa507fa9808b
+  data.tar.gz: af9b568e85cfba7d464b140e4dee71e8810687d4bfcca966468171ebb375f959c4d8c77d416d2662af443bc6b4ef5a7adcad37b49be9a0fa257c686116014f9d

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -84,6 +84,14 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
          long: '--cvlan CUST_VLANS',
          description: 'Comma-delimited list of VLAN names for network adapters to join'
 
+  option :customization_sw_uuid,
+         long: '--sw-uuid SWITCH_UUIDS',
+         description: "Comma-delimited list of distributed virtual switch UUIDs for network adapter to connect, use 'auto' to automatically assign"
+
+  option :customization_macs,
+         long: '--cmacs CUST_MACS',
+         description: 'Comma-delimited list of MAC addresses for network adapters'
+
   option :customization_ips,
          long: '--cips CUST_IPS',
          description: 'Comma-delimited list of CIDR IPs for customization'
@@ -375,13 +383,14 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     # Multiple reboots occur during guest customization in which a link-local
     # address is assigned. As such, we need to wait until a routable IP address
     # becomes available. This is most commonly an issue with Windows instances.
-    sleep 2 while vm.guest.net[config[:bootstrap_nic]].ipConfig.ipAddress.detect { |addr| IPAddr.new(addr.ipAddress).ipv4? }.origin == 'linklayer'
-    vm.guest.net[config[:bootstrap_nic]].ipAddress.detect { |addr| IPAddr.new(addr).ipv4? }
+    sleep 2 while vm.guest.net[bootstrap_nic_index].ipConfig.ipAddress.detect { |addr| IPAddr.new(addr.ipAddress).ipv4? }.origin == 'linklayer'
+    vm.guest.net[bootstrap_nic_index].ipAddress.detect { |addr| IPAddr.new(addr).ipv4? }
   end
 
   def guest_address(vm)
     puts 'Waiting for network interfaces to become available...'
-    sleep 2 while vm.guest.net.empty? && !vm.guest.ipAddress
+    sleep 2 while vm.guest.net.empty? || !vm.guest.ipAddress
+    ui.info "Found address #{vm.guest.ipAddress}" if log_verbose?
     guest_address ||=
       config[:fqdn] = if config[:bootstrap_ipv4]
                         ipv4_address(vm)
@@ -391,7 +400,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
                         # Use the first IP which is not a link-local address.
                         # This is the closest thing to vm.guest.ipAddress but
                         # allows specifying a NIC.
-                        vm.guest.net[config[:bootstrap_nic]].ipConfig.ipAddress.detect do |addr|
+                        vm.guest.net[bootstrap_nic_index].ipConfig.ipAddress.detect do |addr|
                           addr.origin != 'linklayer'
                         end.ipAddress
                       end
@@ -524,6 +533,28 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       clone_spec.config.memoryMB = Integer(get_config(:customization_memory)) * 1024
     end
 
+    if get_config(:customization_macs)
+      unless get_config(:customization_ips)
+        abort('Must specify IP numbers with --cips when specifying MAC addresses with --cmacs, can use "dhcp" as placeholder')
+      end
+      mac_list = if get_config(:customization_macs) == 'auto'
+                   ['auto'] * get_config(:customization_ips).split(',').length
+                 else
+                   get_config(:customization_macs).split(',')
+                 end
+    end
+
+    if get_config(:customization_sw_uuid)
+      unless get_config(:customization_vlan)
+        abort('Must specify VLANs with --cvlan when specifying switch UUIDs with --sw-uuids')
+      end
+      swuuid_list = if get_config(:customization_sw_uuid) == 'auto'
+                      ['auto'] * get_config(customization_ips).split(',').length
+                    else
+                      get_config(:customization_sw_uuid).split(',').map { |swuuid| swuuid.gsub(/((\w+\s+){7})(\w+)\s+(.+)/, '\1\3-\4') }
+                    end
+    end
+
     if get_config(:customization_vlan)
       vlan_list = get_config(:customization_vlan).split(',')
       networks = vlan_list.map { |vlan| find_network(vlan) }
@@ -533,12 +564,21 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       networks.each_with_index do |network, index|
         card = cards[index] || 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)
+          if get_config(:customization_sw_uuid) && (swuuid_list[index] != 'auto')
+            switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(
+              switchUuid: swuuid_list[index], portgroupKey: network.key
+            )
+          else
+            switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(
+              switchUuid: network.config.distributedVirtualSwitch.uuid, portgroupKey: network.key
+            )
+          end
           card.backing.port = switch_port
         rescue
           # not connected to a distibuted switch?
           card.backing = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(network: network, deviceName: network.name)
         end
+        card.macAddress = mac_list[index] if mac_list[index] != 'auto'
         dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(device: card, operation: 'edit')
         clone_spec.config.deviceChange.push dev_spec
       end
@@ -564,15 +604,13 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     end
 
     if config[:customization_ips]
-      if get_config(:customization_gw)
-        cust_spec.nicSettingMap = config[:customization_ips].split(',').map { |i| generate_adapter_map(i, get_config(:customization_gw)) }
-      else
-        cust_spec.nicSettingMap = config[:customization_ips].split(',').map { |i| generate_adapter_map(i) }
-      end
+      cust_spec.nicSettingMap = config[:customization_ips].split(',').map.with_index { |cust_ip, index|
+        generate_adapter_map(cust_ip, get_config(:customization_gw), mac_list[index])
+      }
     end
 
     if get_config(:disable_customization)
-      clone_spec.customization = cust_spec    
+      clone_spec.customization = cust_spec
     else
       use_ident = !config[:customization_hostname].nil? || !get_config(:customization_domain).nil? || cust_spec.identity.nil?
 
@@ -620,11 +658,11 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
           ident = RbVmomi::VIM.CustomizationLinuxPrep
           ident.hostName = RbVmomi::VIM.CustomizationFixedName(name: hostname)
 
-          if get_config(:customization_domain)
-            ident.domain = get_config(:customization_domain)
-          else
-            ident.domain = ''
-          end
+          ident.domain = if get_config(:customization_domain)
+                           get_config(:customization_domain)
+                         else
+                           ''
+                         end
           cust_spec.identity = ident
         else
           ui.error('Customization only supports Linux and Windows currently.')
@@ -684,7 +722,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   # @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)
+  def generate_adapter_map(ip = nil, gw = nil, mac = nil)
     settings = RbVmomi::VIM.CustomizationIPSettings
 
     if ip.nil? || ip.downcase == 'dhcp'
@@ -707,6 +745,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     end
 
     adapter_map = RbVmomi::VIM.CustomizationAdapterMapping
+    adapter_map.macAddress = mac if !mac.nil? && (mac != 'auto')
     adapter_map.adapter = settings
     adapter_map
   end
@@ -872,4 +911,8 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   def random_hostname
     @random_hostname ||= config[:random_vmname_prefix] + SecureRandom.hex(4)
   end
+
+  def bootstrap_nic_index
+    Integer(get_config(:bootstrap_nic))
+  end
 end

data/lib/chef/knife/vsphere_vm_find.rb

@@ -45,7 +45,11 @@ class Chef::Knife::VsphereVmFind < Chef::Knife::BaseVsphereCommand
 
   option :ip,
          long: '--ip',
-         description: 'Show ip'
+         description: 'Show primary ip'
+
+  option :ips,
+         long: '--ips',
+         description: 'Show all ips, with networks'
 
   option :soff,
          long: '--powered-off',
@@ -189,6 +193,11 @@ class Chef::Knife::VsphereVmFind < Chef::Knife::BaseVsphereCommand
        if get_config(:ip)
          print "#{ui.color("IP:", :cyan)} #{vmc.guest.ipAddress}\t"
        end
+       if get_config(:ips)
+         ipregex = /^(?:[0-9]{1,3}\.){3}[0-9]{1,3}$/
+         networks = vmc.guest.net.map { |net| "#{net.network}:" + net.ipConfig.ipAddress.select { |i| i.ipAddress[ipregex] }[0].ipAddress }
+         print "#{ui.color("IPS:", :cyan)} #{networks.join(",")}\t"
+       end
        if get_config(:os)
          print "#{ui.color("OS:", :cyan)} #{vmc.guest.guestFullName}\t"
        end

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.11'
+  VERSION = '1.2.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.2.12
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize