knife-vsphere 3.0.1 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26a03ccec0064effa45cd806abb8b6138780488f1898a777bebe061ddf6f5efb
-  data.tar.gz: 7c0f1c51012bc52c2ed655b6f294f8518b75e677de5ea155a5dd6ee89cbe7f3b
+  metadata.gz: a8f368d4573e232a6f85d7b21aa08ebfe1402874def28c7ef02dbd424d2b925e
+  data.tar.gz: 6431989292639804374815f7b3b3f232e708901f8e51b02ac24c18d88edef8e4
 SHA512:
-  metadata.gz: 3ded62ab8c4166844142a2c4a93c255d35114796d09ba63ef12dd90e42756299f872fc371b52fd0a327b54cf59d3c8dd8a39d206b0e703aa8c1c9fb6de41be54
-  data.tar.gz: 7609876a7dbcad5cd4edadd28b7a8e6d2477098cc42363e2f9e2b92a482ddc83ad3cbc545746b25d614d15251502adb58dabbbc0008a0c1f7aeb22b47900c3b0
+  metadata.gz: 2bbd470a6557c299d64459d8d9d557280851bff0093d37c9dad63c30625b412ec3edc863c695860b84fafffebd9312711b343afa07d3dfdf735f3cbf4a36ef96
+  data.tar.gz: 51e6cdedd5efd0bdf9dcf74ffc8570e81beb69b3d3d7967ca31daa239626b1bf5b35681c423e53a2b96ade0e1ea0ba266340ca0f133f9a01520781168bacfae3

data/lib/chef/knife/base_vsphere_command.rb

@@ -8,6 +8,7 @@ require "chef/knife"
 require "rbvmomi"
 require "base64"
 require "filesize"
+require "chef/knife/bootstrap"
 
 # Power state on
 PS_ON ||= "poweredOn".freeze
@@ -21,9 +22,8 @@ class Chef
   # Base class for knife
   class Knife
     # Main knife vsphere that more or less everything in this gem is built off of
-    class BaseVsphereCommand < Knife
+    class BaseVsphereCommand < Chef::Knife::Bootstrap
       deps do
-        require "chef/knife/bootstrap"
         Chef::Knife::Bootstrap.load_deps
         require "socket"
         require "net/ssh/multi"
@@ -33,55 +33,55 @@ class Chef
 
       def self.common_options
         option :vsphere_user,
-               short: "-u USERNAME",
-               long: "--vsuser USERNAME",
-               description: "The username for vsphere"
+          short: "-u USERNAME",
+          long: "--vsuser USERNAME",
+          description: "The username for vsphere"
 
         option :vsphere_pass,
-               short: "-p PASSWORD",
-               long: "--vspass PASSWORD",
-               description: "The password for vsphere"
+          short: "-p PASSWORD",
+          long: "--vspass PASSWORD",
+          description: "The password for vsphere"
 
         option :vsphere_host,
-               long: "--vshost HOST",
-               description: "The vsphere host"
+          long: "--vshost HOST",
+          description: "The vsphere host"
 
         option :vsphere_dc,
-               short: "-D DATACENTER",
-               long: "--vsdc DATACENTER",
-               description: "The Datacenter for vsphere"
+          short: "-D DATACENTER",
+          long: "--vsdc DATACENTER",
+          description: "The Datacenter for vsphere"
 
         option :vsphere_path,
-               long: "--vspath SOAP_PATH",
-               description: "The vsphere SOAP endpoint path",
-               default: "/sdk"
+          long: "--vspath SOAP_PATH",
+          description: "The vsphere SOAP endpoint path",
+          default: "/sdk"
 
         option :vsphere_port,
-               long: "--vsport PORT",
-               description: "The VI SDK port number to use",
-               default: "443"
+          long: "--vsport PORT",
+          description: "The VI SDK port number to use",
+          default: "443"
 
         option :vsphere_nossl,
-               long: "--vsnossl",
-               description: "Disable SSL connectivity"
+          long: "--vsnossl",
+          description: "Disable SSL connectivity"
 
         option :vsphere_insecure,
-               long: "--vsinsecure",
-               description: "Disable SSL certificate verification"
+          long: "--vsinsecure",
+          description: "Disable SSL certificate verification"
 
         option :folder,
-               short: "-f FOLDER",
-               long: "--folder FOLDER",
-               description: "The folder to get VMs from",
-               default: ""
+          short: "-f FOLDER",
+          long: "--folder FOLDER",
+          description: "The folder to get VMs from",
+          default: ""
 
         option :proxy_host,
-               long: "--proxyhost PROXY_HOSTNAME",
-               description: "Proxy hostname"
+          long: "--proxyhost PROXY_HOSTNAME",
+          description: "Proxy hostname"
 
         option :proxy_port,
-               long: "--proxyport PROXY_PORT",
-               description: "Proxy port"
+          long: "--proxyport PROXY_PORT",
+          description: "Proxy port"
       end
 
       def get_config(key)
@@ -199,6 +199,7 @@ class Chef
         if dvswitch && dvswitch != "auto"
           return networks.find do |f|
             next unless f.respond_to?(:config)
+
             sw = f.config.distributedVirtualSwitch
             sw.uuid == dvswitch || sw.name == dvswitch
           end
@@ -226,6 +227,7 @@ class Chef
         entity_array = poolName.split("/")
         entity_array.each do |entityArrItem|
           next if entityArrItem == ""
+
           if base_entity.is_a? RbVmomi::VIM::Folder
             base_entity = base_entity.childEntity.find { |f| f.name == entityArrItem } ||
               abort("no such pool #{poolName} while looking for #{entityArrItem}")
@@ -251,13 +253,14 @@ class Chef
         dstores.each do |store|
           avail = number_to_human_size(store.summary[:freeSpace])
           cap = number_to_human_size(store.summary[:capacity])
-          puts "#{ui.color('Datastore', :cyan)}: #{store.name} (#{avail}(#{store.summary[:freeSpace]}) / #{cap})"
+          puts "#{ui.color("Datastore", :cyan)}: #{store.name} (#{avail}(#{store.summary[:freeSpace]}) / #{cap})"
 
           # vm's can span multiple datastores, so instead of grabbing the first one
           # let's find the first datastore with the available space on a LUN the vm
           # is already using, or use a specified LUN (if given)
 
           next unless (store.summary[:freeSpace] - vmdk_size_b) > 0
+
           # also let's not use more than 90% of total space to save room for snapshots.
           cap_remains = 100 * ((store.summary[:freeSpace].to_f - vmdk_size_b.to_f) / store.summary[:capacity].to_f)
           candidates.push(store) if cap_remains.to_i > 10

data/lib/chef/knife/search_helper.rb

@@ -34,11 +34,11 @@ module SearchHelper
             type: "ContainerView",
             path: "view",
             skip: false
-          )
-        ]
+          ),
+        ],
       ],
       propSet: [
-        { type: opts[:type], pathSet: opts[:properties] }
+        { type: opts[:type], pathSet: opts[:properties] },
       ]
     )
     pc.RetrieveProperties(specSet: [filter_spec])

data/lib/chef/knife/vsphere_customization_list.rb

@@ -21,7 +21,7 @@ class Chef::Knife::VsphereCustomizationList < Chef::Knife::BaseVsphereCommand
 
     csm = vim.serviceContent.customizationSpecManager
     csm.info.each do |c|
-      puts "#{ui.color('Customization Name', :cyan)}: #{c.name}"
+      puts "#{ui.color("Customization Name", :cyan)}: #{c.name}"
     end
   end
 end

data/lib/chef/knife/vsphere_datastore_file.rb

@@ -10,24 +10,24 @@ class Chef::Knife::VsphereDatastoreFile < Chef::Knife::BaseVsphereCommand
   common_options
 
   option :local_file,
-         long: "--local-file FILE",
-         short: "-f",
-         description: "Local file and path"
+    long: "--local-file FILE",
+    short: "-f",
+    description: "Local file and path"
 
   option :remote_file,
-         long: "--remote-file FILE",
-         short: "-r",
-         description: "Remote file and path"
+    long: "--remote-file FILE",
+    short: "-r",
+    description: "Remote file and path"
 
   option :upload,
-         long: "--upload-file",
-         short: "-u",
-         description: "Upload local file to remote"
+    long: "--upload-file",
+    short: "-u",
+    description: "Upload local file to remote"
 
   option :download,
-         long: "--download-file",
-         short: "-D",
-         description: "Download remote file to local"
+    long: "--download-file",
+    short: "-D",
+    description: "Download remote file to local"
 
   # Main run method for datastore_file
   #

data/lib/chef/knife/vsphere_datastore_list.rb

@@ -26,13 +26,13 @@ class Chef::Knife::VsphereDatastoreList < Chef::Knife::BaseVsphereCommand
   common_options
 
   option :list,
-         long: "--list",
-         short: "-L",
-         description: "Indicates whether to list VM's in datastore",
-         boolean: true
+    long: "--list",
+    short: "-L",
+    description: "Indicates whether to list VM's in datastore",
+    boolean: true
   option :pool,
-         long: "--pool pool",
-         description: "Target pool"
+    long: "--pool pool",
+    description: "Target pool"
 
   # The main run method for datastore_list
   #

data/lib/chef/knife/vsphere_datastore_maxfree.rb

@@ -24,18 +24,18 @@ class Chef::Knife::VsphereDatastoreMaxfree < Chef::Knife::BaseVsphereCommand
   banner "knife vsphere datastore maxfree"
 
   option :regex,
-         short: "-r REGEX",
-         long: "--regex REGEX",
-         description: "Regex to match the datastore name",
-         default: ""
+    short: "-r REGEX",
+    long: "--regex REGEX",
+    description: "Regex to match the datastore name",
+    default: ""
 
   option :vlan,
-         long: "--vlan VLAN",
-         description: "Require listed vlan available to datastore's parent"
+    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"
+    long: "--pool pool",
+    description: "Pool or Cluster to search for datastores in"
 
   common_options
 

data/lib/chef/knife/vsphere_datastorecluster_list.rb

@@ -45,9 +45,10 @@ end
 def print_dsclusters_in_folder(folder)
   folder.childEntity.each do |child|
     next unless child.class.to_s == "StoragePod"
+
     avail = number_to_human_size(child.summary[:freeSpace])
     cap = number_to_human_size(child.summary[:capacity])
-    puts "#{ui.color('DatastoreCluster', :cyan)}: #{child.name} (#{avail} / #{cap})"
+    puts "#{ui.color("DatastoreCluster", :cyan)}: #{child.name} (#{avail} / #{cap})"
   end
 end
 

data/lib/chef/knife/vsphere_datastorecluster_maxfree.rb

@@ -48,10 +48,10 @@ class Chef::Knife::VsphereDatastoreclusterMaxfree < Chef::Knife::BaseVsphereComm
   banner "knife vsphere datastorecluster maxfree"
 
   option :regex,
-         short: "-r REGEX",
-         long: "--regex REGEX",
-         description: "Regex to match the datastore cluster name",
-         default: ""
+    short: "-r REGEX",
+    long: "--regex REGEX",
+    description: "Regex to match the datastore cluster name",
+    default: ""
   common_options
 
   def run

data/lib/chef/knife/vsphere_folder_list.rb

@@ -17,7 +17,7 @@ class Chef::Knife::VsphereFolderList < Chef::Knife::BaseVsphereCommand
   # param [String] folder that you should go through
   # param [String] indent_level for the output to indent
   def traverse_folders(folder, indent_level)
-    puts "#{'  ' * indent_level} #{ui.color('Folder', :cyan)}: " + folder.name
+    puts "#{"  " * indent_level} #{ui.color("Folder", :cyan)}: " + folder.name
 
     folders = find_all_in_folder(folder, RbVmomi::VIM::Folder)
     folders.each do |child|

data/lib/chef/knife/vsphere_hosts_list.rb

@@ -10,9 +10,9 @@ class Chef::Knife::VsphereHostsList < Chef::Knife::BaseVsphereCommand
 
   common_options
   option :pool,
-         long: "--pool pool",
-         short: "-h",
-         description: "Target pool"
+    long: "--pool pool",
+    short: "-h",
+    description: "Target pool"
 
   # The main run method for hosts_list
   #

data/lib/chef/knife/vsphere_pool_list.rb

@@ -16,7 +16,7 @@ class Chef::Knife::VspherePoolList < Chef::Knife::BaseVsphereCommand
 
     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("/")
+      puts "#{ui.color("Pool", :cyan)}: " + pools.map(&:last).join("/")
     end
 
     folders = find_all_in_folder(folder, RbVmomi::VIM::ManagedObject) || []

data/lib/chef/knife/vsphere_vlan_create.rb

@@ -9,8 +9,8 @@ class Chef::Knife::VsphereVlanCreate < Chef::Knife::BaseVsphereCommand
   common_options
 
   option :switch,
-         long: "--switch DVSNAME",
-         description: "The DVSwitch that will hold this VLAN"
+    long: "--switch DVSNAME",
+    description: "The DVSwitch that will hold this VLAN"
 
   # The main run method for vlan_create
   #

data/lib/chef/knife/vsphere_vlan_list.rb

@@ -32,7 +32,7 @@ class Chef::Knife::VsphereVlanList < Chef::Knife::BaseVsphereCommand
     vim_connection
     dc = datacenter
     dc.network.each do |network|
-      puts "#{ui.color('VLAN', :cyan)}: #{network.name}"
+      puts "#{ui.color("VLAN", :cyan)}: #{network.name}"
     end
   end
 end

data/lib/chef/knife/vsphere_vm_cdrom.rb

@@ -15,36 +15,36 @@ class Chef::Knife::VsphereVmCdrom < Chef::Knife::BaseVsphereCommand
   common_options
 
   option :datastore,
-         long: "--datastore STORE",
-         description: "The datastore for an iso source"
+    long: "--datastore STORE",
+    description: "The datastore for an iso source"
 
   option :iso,
-         long: "--iso ISO",
-         description: "The name and path of the ISO to attach"
+    long: "--iso ISO",
+    description: "The name and path of the ISO to attach"
 
   option :attach,
-         short: "-a",
-         long: "--attach",
-         description: "Attach the virtual cdrom to the VM",
-         boolean: true
+    short: "-a",
+    long: "--attach",
+    description: "Attach the virtual cdrom to the VM",
+    boolean: true
 
   option :disconnect,
-         long: "--disconnect",
-         description: "Disconnect the virtual cdrom from the VM",
-         boolean: true
+    long: "--disconnect",
+    description: "Disconnect the virtual cdrom from the VM",
+    boolean: true
 
   option :on_boot,
-         long: "--on_boot ONBOOT",
-         description: "False for Detached on boot or True for Attached on boot"
+    long: "--on_boot ONBOOT",
+    description: "False for Detached on boot or True for Attached on boot"
 
   option :client_device,
-         long: "--client_device",
-         description: "Set the backing store to client-device"
+    long: "--client_device",
+    description: "Set the backing store to client-device"
 
   option :recursive,
-         short: "-r",
-         long: "--recursive",
-         description: "Search all folders"
+    short: "-r",
+    long: "--recursive",
+    description: "Search all folders"
 
   # The main run method for vm_cdrom
   #

data/lib/chef/knife/vsphere_vm_clone.rb

@@ -10,7 +10,6 @@ require "chef/knife"
 require "chef/knife/base_vsphere_command"
 require "chef/knife/customization_helper"
 require "chef/knife/search_helper"
-require "chef/knife/winrm_base"
 require "ipaddr"
 require "netaddr"
 require "securerandom"
@@ -26,327 +25,226 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   # a linklayer origin is an actual nic
   ORIGIN_IS_REAL_NIC ||= "linklayer".freeze
 
-  include Chef::Knife::WinrmBase
+  # include Chef::Knife::WinrmBase
   include CustomizationHelper
   include SearchHelper
   deps do
     require "chef/json_compat"
-    require "chef/knife/bootstrap"
     Chef::Knife::Bootstrap.load_deps
   end
 
   common_options
 
   option :dest_folder,
-         long: "--dest-folder FOLDER",
-         description: "The folder into which to put the cloned VM"
+    long: "--dest-folder FOLDER",
+    description: "The folder into which to put the cloned VM"
 
   option :datastore,
-         long: "--datastore STORE",
-         description: "The datastore into which to put the cloned VM"
+    long: "--datastore STORE",
+    description: "The datastore into which to put the cloned VM"
 
   option :datastorecluster,
-         long: "--datastorecluster STORE",
-         description: "The datastorecluster into which to put the cloned VM"
+    long: "--datastorecluster STORE",
+    description: "The datastorecluster into which to put the cloned VM"
 
   option :host,
-         long: "--host HOST",
-         description: "The host into which to put the cloned VM"
+    long: "--host HOST",
+    description: "The host into which to put the cloned VM"
 
   option :resource_pool,
-         long: "--resource-pool POOL",
-         description: "The resource pool or cluster into which to put the cloned VM"
+    long: "--resource-pool POOL",
+    description: "The resource pool or cluster into which to put the cloned VM"
 
   option :source_vm,
-         long: "--template TEMPLATE",
-         description: "The source VM / Template to clone from"
+    long: "--template TEMPLATE",
+    description: "The source VM / Template to clone from"
 
   option :linked_clone,
-         long: "--linked-clone",
-         description: "Indicates whether to use linked clones.",
-         boolean: false
+    long: "--linked-clone",
+    description: "Indicates whether to use linked clones.",
+    boolean: false
 
   option :thin_provision,
-         long: "--thin-provision",
-         description: "Indicates whether disk should be thin provisioned.",
-         boolean: true
+    long: "--thin-provision",
+    description: "Indicates whether disk should be thin provisioned.",
+    boolean: true
 
   option :annotation,
-         long: "--annotation TEXT",
-         description: "Add TEXT in Notes field from annotation"
+    long: "--annotation TEXT",
+    description: "Add TEXT in Notes field from annotation"
 
   option :customization_spec,
-         long: "--cspec CUST_SPEC",
-         description: "The name of any customization specification to apply"
+    long: "--cspec CUST_SPEC",
+    description: "The name of any customization specification to apply"
 
   option :customization_plugin,
-         long: "--cplugin CUST_PLUGIN_PATH",
-         description: "Path to plugin that implements KnifeVspherePlugin.customize_clone_spec and/or KnifeVspherePlugin.reconfig_vm"
+    long: "--cplugin CUST_PLUGIN_PATH",
+    description: "Path to plugin that implements KnifeVspherePlugin.customize_clone_spec and/or KnifeVspherePlugin.reconfig_vm"
 
   option :customization_plugin_data,
-         long: "--cplugin-data CUST_PLUGIN_DATA",
-         description: "String of data to pass to the plugin.  Use any format you wish."
+    long: "--cplugin-data CUST_PLUGIN_DATA",
+    description: "String of data to pass to the plugin.  Use any format you wish."
 
   option :customization_vlan,
-         long: "--cvlan CUST_VLANS",
-         description: "Comma-delimited list of VLAN names for network adapters to join"
+    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"
+    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",
-         default: AUTO_MAC
+    long: "--cmacs CUST_MACS",
+    description: "Comma-delimited list of MAC addresses for network adapters",
+    default: AUTO_MAC
 
   option :customization_ips,
-         long: "--cips CUST_IPS",
-         description: "Comma-delimited list of CIDR IPs for customization",
-         default: NO_IPS
+    long: "--cips CUST_IPS",
+    description: "Comma-delimited list of CIDR IPs for customization",
+    default: NO_IPS
 
   option :customization_dns_ips,
-         long: "--cdnsips CUST_DNS_IPS",
-         description: "Comma-delimited list of DNS IP addresses"
+    long: "--cdnsips CUST_DNS_IPS",
+    description: "Comma-delimited list of DNS IP addresses"
 
   option :customization_dns_suffixes,
-         long: "--cdnssuffix CUST_DNS_SUFFIXES",
-         description: "Comma-delimited list of DNS search suffixes"
+    long: "--cdnssuffix CUST_DNS_SUFFIXES",
+    description: "Comma-delimited list of DNS search suffixes"
 
   option :customization_gw,
-         long: "--cgw CUST_GW",
-         description: "CIDR IP of gateway for customization"
+    long: "--cgw CUST_GW",
+    description: "CIDR IP of gateway for customization"
 
   option :customization_hostname,
-         long: "--chostname CUST_HOSTNAME",
-         description: "Unqualified hostname for customization"
+    long: "--chostname CUST_HOSTNAME",
+    description: "Unqualified hostname for customization"
 
   option :customization_domain,
-         long: "--cdomain CUST_DOMAIN",
-         description: "Domain name for customization"
+    long: "--cdomain CUST_DOMAIN",
+    description: "Domain name for customization"
 
   option :customization_tz,
-         long: "--ctz CUST_TIMEZONE",
-         description: "Timezone invalid 'Area/Location' format"
+    long: "--ctz CUST_TIMEZONE",
+    description: "Timezone invalid 'Area/Location' format"
 
   option :customization_cpucount,
-         long: "--ccpu CUST_CPU_COUNT",
-         description: "Number of CPUs"
+    long: "--ccpu CUST_CPU_COUNT",
+    description: "Number of CPUs"
 
   option :customization_corespersocket,
-         long: "--ccorespersocket CUST_CPU_CORES_PER_SOCKET",
-         description: "Number of CPU Cores per Socket"
+    long: "--ccorespersocket CUST_CPU_CORES_PER_SOCKET",
+    description: "Number of CPU Cores per Socket"
 
   option :customization_memory,
-         long: "--cram CUST_MEMORY_GB",
-         description: "Gigabytes of RAM"
+    long: "--cram CUST_MEMORY_GB",
+    description: "Gigabytes of RAM"
 
   option :customization_memory_reservation,
-         long: "--cram_reservation CUST_MEMORY_RESERVATION_GB",
-         description: "Gigabytes of RAM"
+    long: "--cram_reservation CUST_MEMORY_RESERVATION_GB",
+    description: "Gigabytes of RAM"
 
   option :power,
-         long: "--start",
-         description: "Indicates whether to start the VM after a successful clone",
-         boolean: false
+    long: "--start",
+    description: "Indicates whether to start the VM after a successful clone",
+    boolean: false
 
   option :bootstrap,
-         long: "--bootstrap",
-         description: "Indicates whether to bootstrap the VM",
-         boolean: false
+    long: "--bootstrap",
+    description: "Indicates whether to bootstrap the VM",
+    boolean: false
 
   option :environment,
-         long: "--environment ENVIRONMENT",
-         description: "Environment to add the node to for bootstrapping"
+    long: "--environment ENVIRONMENT",
+    description: "Environment to add the node to for bootstrapping"
 
   option :fqdn,
-         long: "--fqdn SERVER_FQDN",
-         description: "Fully qualified hostname for bootstrapping"
+    long: "--fqdn SERVER_FQDN",
+    description: "Fully qualified hostname for bootstrapping"
 
   option :bootstrap_msi_url,
-         long: "--bootstrap-msi-url URL",
-         description: "Location of the Chef Client MSI. The default templates will prefer to download from this location."
+    long: "--bootstrap-msi-url URL",
+    description: "Location of the Chef Client MSI. The default templates will prefer to download from this location."
 
   option :bootstrap_protocol,
-         long: "--bootstrap-protocol protocol",
-         description: "Protocol to bootstrap windows servers. options: winrm/ssh",
-         proc: proc { |key| Chef::Config[:knife][:bootstrap_protocol] = key },
-         default: nil
-
-  option :ssh_user,
-         short: "-x USERNAME",
-         long: "--ssh-user USERNAME",
-         description: "The ssh username",
-         default: "root"
-
-  option :ssh_password,
-         short: "-P PASSWORD",
-         long: "--ssh-password PASSWORD",
-         description: "The ssh password"
-
-  option :ssh_port,
-         short: "-p PORT",
-         long: "--ssh-port PORT",
-         description: "The ssh port",
-         default: "22"
-
-  option :identity_file,
-         short: "-i IDENTITY_FILE",
-         long: "--identity-file IDENTITY_FILE",
-         description: "The SSH identity file used for authentication"
-
-  option :chef_node_name,
-         short: "-N NAME",
-         long: "--node-name NAME",
-         description: "The Chef node name for your new node"
-
-  option :prerelease,
-         long: "--prerelease",
-         description: "Install the pre-release chef gems",
-         boolean: false
-
-  option :bootstrap_version,
-         long: "--bootstrap-version VERSION",
-         description: "The version of Chef to install",
-         proc: proc { |v| Chef::Config[:knife][:bootstrap_version] = v }
-
-  option :bootstrap_proxy,
-         long: "--bootstrap-proxy PROXY_URL",
-         description: "The proxy server for the node being bootstrapped",
-         proc: proc { |p| Chef::Config[:knife][:bootstrap_proxy] = p }
-
-  option :bootstrap_vault_file,
-         long: "--bootstrap-vault-file VAULT_FILE",
-         description: "A JSON file with a list of vault(s) and item(s) to be updated"
-
-  option :bootstrap_vault_json,
-         long: "--bootstrap-vault-json VAULT_JSON",
-         description: "A JSON string with the vault(s) and item(s) to be updated"
-
-  option :bootstrap_vault_item,
-         long: "--bootstrap-vault-item VAULT_ITEM",
-         description: 'A single vault and item to update as "vault:item"',
-         proc: proc { |i|
-           (vault, item) = i.split(/:/)
-           Chef::Config[:knife][:bootstrap_vault_item] ||= {}
-           Chef::Config[:knife][:bootstrap_vault_item][vault] ||= []
-           Chef::Config[:knife][:bootstrap_vault_item][vault].push(item)
-           Chef::Config[:knife][:bootstrap_vault_item]
-         }
-
-  option :distro,
-         short: "-d DISTRO",
-         long: "--distro DISTRO",
-         description: "Bootstrap a distro using a template. [DEPRECATED] Use -t / --bootstrap-template option instead.",
-         proc: Proc.new { |v|
-                 Chef::Log.fatal("[DEPRECATED] -d / --distro option is deprecated. Use --bootstrap-template option instead.")
-                 v
-               }
-
-  option :tags,
-         long: "--tags TAGS",
-         description: "Comma separated list of tags to apply to the node",
-         proc: ->(tags) { tags.split(/[\s,]+/) },
-         default: []
-
-  option :bootstrap_template,
-         short: "-t TEMPLATE",
-         long: "--bootstrap-template TEMPLATE",
-         description: "Bootstrap Chef using a built-in or custom template. Set to the full path of an erb template or use one of the built-in templates."
-
-  option :template_file,
-         long: "--template-file TEMPLATE",
-         description: "Full path to location of template to use. [DEPRECATED] Use -t / --bootstrap-template option",
-         proc: Proc.new { |v|
-                 Chef::Log.fatal("[DEPRECATED] --template-file option is deprecated. Use --bootstrap-template option instead.")
-                 v
-               }
-
-  option :run_list,
-         short: "-r RUN_LIST",
-         long: "--run-list RUN_LIST",
-         description: "Comma separated list of roles/recipes to apply",
-         proc: ->(o) { o.split(/[\s,]+/) },
-         default: []
-
-  option :secret_file,
-         long: "--secret-file SECRET_FILE",
-         description: "A file containing the secret key to use to encrypt data bag item values",
-         proc: ->(secret_file) { Chef::Config[:knife][:secret_file] = secret_file }
-
-  # rubocop:disable Style/Blocks
-  option :hint,
-         long: "--hint HINT_NAME[=HINT_FILE]",
-         description: "Specify Ohai Hint to be set on the bootstrap target.  Use multiple --hint options to specify multiple hints.",
-         proc: proc { |h|
-           Chef::Config[:knife][:hints] ||= {}
-           name, path = h.split("=")
-           Chef::Config[:knife][:hints][name] = path ? JSON.parse(::File.read(path)) : {}
-         },
-         default: ""
-  # rubocop:enable Style/Blocks
-
-  option :no_host_key_verify,
-         long: "--no-host-key-verify",
-         description: "Disable host key verification",
-         boolean: true
-
-  option :node_ssl_verify_mode,
-         long: "--node-ssl-verify-mode [peer|none]",
-         description: "Whether or not to verify the SSL cert for all HTTPS requests when bootstrapping"
-
-  option :first_boot_attributes,
-         short: "-j JSON_ATTRIBS",
-         long: "--json-attributes",
-         description: "A JSON string to be added to the first run of chef-client",
-         proc: ->(o) { JSON.parse(o) },
-         default: {}
+    long: "--bootstrap-protocol protocol",
+    description: "Protocol to bootstrap windows servers. options: winrm/ssh",
+    proc: proc { |key| Chef::Config[:knife][:bootstrap_protocol] = key },
+    default: nil
 
   option :disable_customization,
-         long: "--disable-customization",
-         description: "Disable default customization",
-         boolean: true,
-         default: false
+    long: "--disable-customization",
+    description: "Disable default customization",
+    boolean: true,
+    default: false
 
   option :log_level,
-         short: "-l LEVEL",
-         long: "--log_level",
-         description: "Set the log level (debug, info, warn, error, fatal) for chef-client",
-         proc: ->(l) { l.to_sym }
+    short: "-l LEVEL",
+    long: "--log_level",
+    description: "Set the log level (debug, info, warn, error, fatal) for chef-client",
+    proc: ->(l) { l.to_sym }
 
   option :mark_as_template,
-         long: "--mark_as_template",
-         description: "Indicates whether to mark the new vm as a template",
-         boolean: false
+    long: "--mark_as_template",
+    description: "Indicates whether to mark the new vm as a template",
+    boolean: false
 
   option :random_vmname,
-         long: "--random-vmname",
-         description: "Creates a random VMNAME starts with vm-XXXXXXXX",
-         boolean: false
+    long: "--random-vmname",
+    description: "Creates a random VMNAME starts with vm-XXXXXXXX",
+    boolean: false
 
   option :random_vmname_prefix,
-         long: "--random-vmname-prefix PREFIX",
-         description: "Change the VMNAME prefix",
-         default: "vm-"
+    long: "--random-vmname-prefix PREFIX",
+    description: "Change the VMNAME prefix",
+    default: "vm-"
 
   option :sysprep_timeout,
-         long: "--sysprep_timeout TIMEOUT",
-         description: "Wait TIMEOUT seconds for sysprep event before continuing with bootstrap",
-         default: 600
+    long: "--sysprep_timeout TIMEOUT",
+    description: "Wait TIMEOUT seconds for sysprep event before continuing with bootstrap",
+    default: 600
 
   option :bootstrap_nic,
-         long: "--bootstrap-nic INTEGER",
-         description: "Network interface to use when multiple NICs are defined on a template.",
-         default: 0
+    long: "--bootstrap-nic INTEGER",
+    description: "Network interface to use when multiple NICs are defined on a template.",
+    default: 0
 
   option :bootstrap_ipv4,
-         long: "--bootstrap-ipv4",
-         description: "Force using an IPv4 address when a NIC has both IPv4 and IPv6 addresses.",
-         default: false
+    long: "--bootstrap-ipv4",
+    description: "Force using an IPv4 address when a NIC has both IPv4 and IPv6 addresses.",
+    default: false
 
   def run
+    check_license
+
+    plugin_setup!
+    validate_name_args!
+    validate_protocol!
+    validate_first_boot_attributes!
+    validate_winrm_transport_opts!
+    validate_policy_options!
+    plugin_validate_options!
+
+    winrm_warn_no_ssl_verification
+    warn_on_short_session_timeout
+
+    plugin_create_instance!
+
+    return unless get_config(:bootstrap)
+
     $stdout.sync = true
+    connect!
+    register_client
 
+    content = render_template
+    bootstrap_path = upload_bootstrap(content)
+    perform_bootstrap(bootstrap_path)
+    plugin_finalize
+  ensure
+    connection.del_file!(bootstrap_path) if connection && bootstrap_path
+  end
+
+  # @return [TrueClass] If options are valid or exits
+  def plugin_validate_options!
     unless using_supplied_hostname? ^ using_random_hostname?
       show_usage
       fatal_exit("You must specify a virtual machine name OR use --random-vmname")
@@ -361,7 +259,18 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     if get_config(:customization_macs) != AUTO_MAC && get_config(:customization_ips) == NO_IPS
       abort('Must specify IP numbers with --cips when specifying MAC addresses with --cmacs, can use "dhcp" as placeholder')
     end
+  end
 
+  attr_accessor :server_name
+
+  alias host_descriptor server_name
+
+  # Create the server that we will bootstrap, if necessary
+  #
+  # Plugins that subclass bootstrap, e.g. knife-ec2, can use this method to call out to an API to build an instance of the server we wish to bootstrap
+  #
+  # @return [TrueClass] If instance successfully created, or exits
+  def plugin_create_instance!
     config[:chef_node_name] = vmname unless get_config(:chef_node_name)
 
     vim = vim_connection
@@ -405,6 +314,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     end
 
     return if get_config(:mark_as_template)
+
     if get_config(:power) || get_config(:bootstrap)
       vm = get_vm_by_name(vmname, cust_folder) || fatal_exit("VM #{vmname} not found")
       begin
@@ -414,13 +324,12 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
       end
       puts "Powered on virtual machine #{vmname}"
     end
-
     return unless get_config(:bootstrap)
 
-    connect_port = get_config(:ssh_port)
     protocol = get_config(:bootstrap_protocol)
     if windows?(src_vm.config)
       protocol ||= "winrm"
+      connect_port ||= 5985
       unless config[:disable_customization]
         # Wait for customization to complete
         puts "Waiting for customization to complete..."
@@ -428,20 +337,35 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
         puts "Customization Complete"
       end
       connect_host = guest_address(vm)
+      self.server_name = connect_host
       Chef::Log.debug("Connect Host for winrm Bootstrap: #{connect_host}")
       wait_for_access(connect_host, connect_port, protocol)
-      ssh_override_winrm
-      bootstrap_for_windows_node.run
     else
       connect_host = guest_address(vm)
+      self.server_name = connect_host
+      connect_port ||= 22
       Chef::Log.debug("Connect Host for SSH Bootstrap: #{connect_host}")
       protocol ||= "ssh"
       wait_for_access(connect_host, connect_port, protocol)
-      ssh_override_winrm
-      bootstrap_for_node.run
     end
   end
 
+  # Perform any setup necessary by the plugin
+  #
+  # Plugins that subclass bootstrap, e.g. knife-ec2, can use this method to create connection objects
+  #
+  # @return [TrueClass] If instance successfully created, or exits
+  def plugin_setup!; end
+
+  # Perform any teardown or cleanup necessary by the plugin
+  #
+  # Plugins that subclass bootstrap, e.g. knife-ec2, can use this method to display a message or perform any cleanup
+  #
+  # @return [void]
+  def plugin_finalize; end
+
+  def validate_name_args!; end
+
   def ipv4_address(vm)
     puts "Waiting for a valid IPv4 address..."
     # Multiple reboots occur during guest customization in which a link-local
@@ -475,12 +399,11 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   end
 
   def wait_for_access(connect_host, connect_port, protocol)
-    if protocol == "winrm"
-      load_winrm_deps
-      if get_config(:winrm_transport) == "ssl" && get_config(:winrm_port) == "5985"
-        config[:winrm_port] = "5986"
+    if winrm?
+      if get_config(:winrm_ssl) && get_config(:connection_port) == "5985"
+        config[:connection_port] = "5986"
       end
-      connect_port = get_config(:winrm_port)
+      connect_port = get_config(:connection_port)
       print "\n#{ui.color("Waiting for winrm access to become available on #{connect_host}:#{connect_port}", :magenta)}"
       print(".") until tcp_test_winrm(connect_host, connect_port) do
         sleep 10
@@ -513,7 +436,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
               new_disk.backing.fileName = "[#{disk.backing.datastore.name}]"
               new_disk.backing.parent = disk.backing
             end,
-          }
+          },
         ],
       }
       src_vm.ReconfigVM_Task(spec: spec).wait_for_completion
@@ -565,6 +488,7 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
   def find_host(host_name)
     host = all_the_hosts.find { |host| host.name == host_name }
     raise "Can't find #{host_name}. I found #{all_the_hosts.map(&:name)}" unless host
+
     host
   end
 
@@ -843,89 +767,8 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     adapter_map
   end
 
-  def bootstrap_common_params(bootstrap)
-    bootstrap.config[:run_list] = config[:run_list]
-    bootstrap.config[:bootstrap_version] = get_config(:bootstrap_version)
-    bootstrap.config[:environment] = get_config(:environment)
-    bootstrap.config[:prerelease] = get_config(:prerelease)
-    bootstrap.config[:first_boot_attributes] = get_config(:first_boot_attributes)
-    bootstrap.config[:hint] = get_config(:hint)
-    bootstrap.config[:chef_node_name] = get_config(:chef_node_name)
-    bootstrap.config[:bootstrap_vault_file] = get_config(:bootstrap_vault_file)
-    bootstrap.config[:bootstrap_vault_json] = get_config(:bootstrap_vault_json)
-    bootstrap.config[:bootstrap_vault_item] = get_config(:bootstrap_vault_item)
-    # may be needed for vpc mode
-    bootstrap.config[:no_host_key_verify] = get_config(:no_host_key_verify)
-    bootstrap.config[:node_ssl_verify_mode] = get_config(:node_ssl_verify_mode)
-    bootstrap.config[:tags] = get_config(:tags)
-    bootstrap
-  end
-
-  def bootstrap_for_windows_node
-    Chef::Knife::Bootstrap.load_deps
-    if get_config(:bootstrap_protocol) == "winrm" || get_config(:bootstrap_protocol).nil?
-      bootstrap = Chef::Knife::BootstrapWindowsWinrm.new
-      bootstrap.name_args = [config[:fqdn]]
-      bootstrap.config[:winrm_user] = get_config(:winrm_user)
-      bootstrap.config[:winrm_password] = get_config(:winrm_password)
-      bootstrap.config[:winrm_transport] = get_config(:winrm_transport)
-      bootstrap.config[:winrm_port] = get_config(:winrm_port)
-    elsif get_config(:bootstrap_protocol) == "ssh"
-      bootstrap = Chef::Knife::BootstrapWindowsSsh.new
-      bootstrap.config[:ssh_user] = get_config(:ssh_user)
-      bootstrap.config[:ssh_password] = get_config(:ssh_password)
-      bootstrap.config[:ssh_port] = get_config(:ssh_port)
-    else
-      ui.error("Unsupported Bootstrapping Protocol. Supports : winrm, ssh")
-      exit 1
-    end
-    bootstrap.config[:msi_url] = get_config(:bootstrap_msi_url)
-    bootstrap_common_params(bootstrap)
-  end
-
-  def bootstrap_for_node
-    Chef::Knife::Bootstrap.load_deps
-    bootstrap = Chef::Knife::Bootstrap.new
-    bootstrap.name_args = [config[:fqdn]]
-    bootstrap.config[:bootstrap_template] = get_config(:bootstrap_template)
-    bootstrap.config[:secret_file] = get_config(:secret_file)
-    bootstrap.config[:ssh_user] = get_config(:ssh_user)
-    bootstrap.config[:ssh_password] = get_config(:ssh_password)
-    bootstrap.config[:ssh_port] = get_config(:ssh_port)
-    bootstrap.config[:identity_file] = get_config(:identity_file)
-    bootstrap.config[:use_sudo] = true unless get_config(:ssh_user) == "root"
-    bootstrap.config[:use_sudo_password] = true unless get_config(:ssh_user) == "root"
-    bootstrap.config[:log_level] = get_config(:log_level)
-    bootstrap_common_params(bootstrap)
-  end
-
-  def ssh_override_winrm
-    # unchanged ssh_user and changed winrm_user, override ssh_user
-    if get_config(:ssh_user).eql?(options[:ssh_user][:default]) &&
-        !get_config(:winrm_user).eql?(options[:winrm_user][:default])
-      config[:ssh_user] = get_config(:winrm_user)
-    end
-
-    # unchanged ssh_port and changed winrm_port, override ssh_port
-    if get_config(:ssh_port).eql?(options[:ssh_port][:default]) &&
-        !get_config(:winrm_port).eql?(options[:winrm_port][:default])
-      config[:ssh_port] = get_config(:winrm_port)
-    end
-
-    # unset ssh_password and set winrm_password, override ssh_password
-    if get_config(:ssh_password).nil? &&
-        !get_config(:winrm_password).nil?
-      config[:ssh_password] = get_config(:winrm_password)
-    end
-
-    # unset identity_file and set kerberos_keytab_file, override identity_file
-    return unless get_config(:identity_file).nil? && !get_config(:kerberos_keytab_file).nil?
-
-    config[:identity_file] = get_config(:kerberos_keytab_file)
-  end
-
-  def tcp_test_ssh(hostname, ssh_port)
-    tcp_socket = TCPSocket.new(hostname, ssh_port)
+  def tcp_test_ssh(hostname, connection_port)
+    tcp_socket = TCPSocket.new(hostname, connection_port)
     readable = IO.select([tcp_socket], nil, nil, 5)
     if readable
       ssh_banner = tcp_socket.gets
@@ -978,14 +821,6 @@ class Chef::Knife::VsphereVmClone < Chef::Knife::BaseVsphereCommand
     tcp_socket && tcp_socket.close
   end
 
-  def load_winrm_deps
-    require "winrm"
-    require "chef/knife/winrm"
-    require "chef/knife/bootstrap_windows_winrm"
-    require "chef/knife/bootstrap_windows_ssh"
-    require "chef/knife/core/windows_bootstrap_context"
-  end
-
   private
 
   def vmname