knife-vsphere 1.2.18 → 1.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d94e79affa56d7c9ac20ff54a800e882729a428
-  data.tar.gz: 02e05a982fde906a602ed5f5033c20f259b9db9a
+  metadata.gz: 0c25fd6b8d92bd7e275f83b51cf56547e11c40bc
+  data.tar.gz: fa0e605b6779e90693077b4505648ea123e9365d
 SHA512:
-  metadata.gz: f674ccb248127469ec5bc4e26f9410a08602180ee205280b68ef500f8da7ef296f665f133f5ca230f051fb74948e28e6d1697a94acb0c79a676111681b074eb2
-  data.tar.gz: 827d76a2f790947f0123a26d57703620eb9c477b37ff927be06722a4edb6ede2f93a470d2044af33a2c735357ff7a1d589815e2cbfb30572cf702e1d87e11259
+  metadata.gz: e82afdd76191d93c17ac79a3f349bf2fcf5225b50bc1bc97535ee7a1c017a50fe1528eb6bd83d5283f8cbe7912f458d346a7cafe482b4411c2bdf2f26ec02c24
+  data.tar.gz: 6ba7c5d6f7923ed5bbcb5d12b5de0855a8cfaa06656ed8b73d510bc1979c534037e6531eb294e6a2a2f9a182da62c8fe18ecd76b4deb78f94e74cdab73fa23ac

data/lib/chef/knife/vsphere_vm_network_add.rb

@@ -0,0 +1,68 @@
+#
+# Author:: Scott Williams (<scott@backups.net.au>)
+# License:: Apache License, Version 2.0
+#
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+require 'netaddr'
+
+class Chef::Knife::VsphereVmNetworkAdd < Chef::Knife::BaseVsphereCommand
+  banner 'knife vsphere vm network add VMNAME NETWORKNAME'
+
+  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
+
+    networkname = @name_args[1]
+    if networkname.nil?
+      show_usage
+      fatal_exit('You must specify the network name')
+    end
+
+    vim_connection
+
+    dc = datacenter
+    folder = find_folder(get_config(:folder)) || dc.vmFolder
+    vm = traverse_folders_for_vm(folder, vmname) || abort("VM #{vmname} not found")
+
+    network = find_network(networkname)
+
+    puts network.class
+    case network
+    when RbVmomi::VIM::DistributedVirtualPortgroup
+      switch, pg_key = network.collect 'config.distributedVirtualSwitch', 'key'
+      port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(
+        switchUuid: switch.uuid,
+        portgroupKey: pg_key
+      )
+      summary = network.name
+      backing = RbVmomi::VIM.VirtualEthernetCardDistributedVirtualPortBackingInfo(port: port)
+    when VIM::Network
+      summary = network.name
+      backing = RbVmomi::VIM.VirtualEthernetCardNetworkBackingInfo(deviceName: network.name)
+    else fail
+    end
+
+    vm.ReconfigVM_Task(
+      spec: {
+        deviceChange: [{
+          operation: :add,
+          fileOperation: nil,
+          device: RbVmomi::VIM::VirtualVmxnet3(
+            key: -1,
+            deviceInfo: { summary: summary, label: '' },
+            backing: backing,
+            addressType: 'generated'
+          )
+        }]
+      }
+    ).wait_for_completion
+  end
+end

data/lib/chef/knife/vsphere_vm_vnc_set.rb

@@ -0,0 +1,54 @@
+#
+# Author:: Scott Williams (<scott@backups.net.au>)
+# License:: Apache License, Version 2.0
+#
+require 'chef/knife'
+require 'chef/knife/base_vsphere_command'
+require 'rbvmomi'
+require 'netaddr'
+
+class Chef::Knife::VsphereVmVncset < Chef::Knife::BaseVsphereCommand
+  banner 'knife vsphere vm vncset VMNAME COMMAND ARGS'
+
+  option :vnc_port,
+         long: '--vnc-port PORT',
+         description: 'Port to run VNC on',
+         required: true
+
+  option :vnc_password,
+         long: '--vnc-password PASSWORD',
+         description: 'Password for connecting to VNC',
+         required: true
+
+  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_connection
+
+    dc = datacenter
+    folder = find_folder(get_config(:folder)) || dc.vmFolder
+
+    vm = find_in_folder(folder, RbVmomi::VIM::VirtualMachine, vmname) || abort("VM #{vmname} not found")
+
+    extra_config, = vm.collect('config.extraConfig')
+
+    vm.ReconfigVM_Task(
+      spec: {
+        extraConfig: [
+          { key: 'RemoteDisplay.vnc.enabled', value: 'true' },
+          { key: 'RemoteDisplay.vnc.port', value: config[:vnc_port].to_s },
+          { key: 'RemoteDisplay.vnc.password', value: config[:vnc_password].to_s }
+        ]
+      }
+    ).wait_for_completion
+
+    puts extra_config.detect { |x| 'RemoteDisplay.vnc.enabled'.casecmp(x.key) && 'true'.casecmp(x.value.downcase) }
+  end
+end

data/lib/knife-vsphere/version.rb

@@ -1,3 +1,3 @@
 module KnifeVsphere
-  VERSION = '1.2.18'
+  VERSION = '1.2.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.2.18
+  version: 1.2.19
 platform: ruby
 authors:
 - Ezra Pagel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: filesize
@@ -159,6 +159,7 @@ files:
 - lib/chef/knife/vsphere_vm_migrate.rb
 - lib/chef/knife/vsphere_vm_move.rb
 - lib/chef/knife/vsphere_vm_net.rb
+- lib/chef/knife/vsphere_vm_network_add.rb
 - lib/chef/knife/vsphere_vm_network_set.rb
 - lib/chef/knife/vsphere_vm_property_get.rb
 - lib/chef/knife/vsphere_vm_property_set.rb
@@ -168,6 +169,7 @@ files:
 - lib/chef/knife/vsphere_vm_state.rb
 - lib/chef/knife/vsphere_vm_toolsconfig.rb
 - lib/chef/knife/vsphere_vm_vmdk_add.rb
+- lib/chef/knife/vsphere_vm_vnc_set.rb
 - lib/chef/knife/vsphere_vm_wait_sysprep.rb
 - lib/knife-vsphere/version.rb
 homepage: http://github.com/ezrapagel/knife-vsphere