From 40f5233f851632d8311c8c1a4f748c66bc3e69b9 Mon Sep 17 00:00:00 2001
From: Sebastien Andrivet <sebastien@advtools.com>
Date: Sun, 7 Jan 2018 22:37:33 +0100
Subject: [PATCH] Add --Port and --Key (for public-key authentication)
 parameters

---
 .gitignore           |  4 +++-
 esxi-vm-create       | 24 ++++++++++++++++--------
 esxi_vm_functions.py |  5 +++--
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 93b8f73..7637ef6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-esxi_vm_functions.pyc
+*.pyc
+.python-version
+.idea
diff --git a/esxi-vm-create b/esxi-vm-create
index 818c6b5..11780f9 100755
--- a/esxi-vm-create
+++ b/esxi-vm-create
@@ -2,13 +2,9 @@
 
 
 import argparse                   # Argument parser
-import datetime                   # For current Date/Time
-import os.path                    # To check if file exists
 import sys                        # For args
 import re                         # For regex
 import paramiko                   # For remote ssh
-import yaml
-import warnings
 
 from esxi_vm_functions import *
 
@@ -20,8 +16,10 @@ isDryRun = ConfigData['isDryRun']
 isVerbose = ConfigData['isVerbose']
 isSummary = ConfigData['isSummary']
 HOST = ConfigData['HOST']
+PORT = ConfigData['PORT']
 USER = ConfigData['USER']
 PASSWORD = ConfigData['PASSWORD']
+KEY = ConfigData['KEY']
 CPU = ConfigData['CPU']
 MEM = ConfigData['MEM']
 HDISK = int(ConfigData['HDISK'])
@@ -50,8 +48,10 @@ parser = argparse.ArgumentParser(description='ESXi Create VM utility.')
 
 parser.add_argument('-d', '--dry', dest='isDryRunarg', action='store_true', help="Enable Dry Run mode  (" + str(isDryRun) + ")")
 parser.add_argument("-H", "--Host", dest='HOST', type=str, help="ESXi Host/IP  (" + str(HOST) + ")")
+parser.add_argument("-T", "--Port", dest='PORT', type=str, help="ESXi Port number  (" + str(PORT) + ")")
 parser.add_argument("-U", "--User", dest='USER', type=str, help="ESXi Host username  (" + str(USER) + ")")
 parser.add_argument("-P", "--Password", dest='PASSWORD', type=str, help="ESXi Host password  (*****)")
+parser.add_argument("-K", "--Key", dest='KEY', type=str, help="ESXi Host connection key")
 parser.add_argument("-n", "--name", dest='NAME', type=str, help="VM name")
 parser.add_argument("-c", "--cpu", dest='CPU', type=int, help="Number of vCPUS  (" + str(CPU) + ")")
 parser.add_argument("-m", "--mem", type=int, help="Memory in GB  (" + str(MEM) + ")")
@@ -77,11 +77,15 @@ if args.isVerbosearg:
 if args.isSummaryarg:
     isSummary = True
 if args.HOST:
-   HOST=args.HOST
+    HOST=args.HOST
+if args.PORT:
+    PORT=args.PORT
 if args.USER:
     USER=args.USER
 if args.PASSWORD:
     PASSWORD=args.PASSWORD
+if args.KEY:
+    KEY=args.KEY
 if args.NAME:
     NAME=args.NAME
 if args.CPU:
@@ -114,8 +118,10 @@ if args.UPDATE:
     ConfigData['isVerbose'] = isVerbose
     ConfigData['isSummary'] = isSummary
     ConfigData['HOST'] = HOST
+    ConfigData['PORT'] = PORT
     ConfigData['USER'] = USER
     ConfigData['PASSWORD'] = PASSWORD
+    ConfigData['KEY'] = KEY
     ConfigData['CPU'] = CPU
     ConfigData['MEM'] = MEM
     ConfigData['HDISK'] = HDISK
@@ -143,16 +149,16 @@ if NAME == "":
 try:
     ssh = paramiko.SSHClient()
     ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-    ssh.connect(HOST, username=USER, password=PASSWORD)
+    ssh.connect(HOST, port=PORT, username=USER, password=PASSWORD, key_filename=KEY)
 
     (stdin, stdout, stderr) = ssh.exec_command("esxcli system version get |grep Version")
     type(stdin)
     if re.match("Version", str(stdout.readlines())) is not None:
-        print "Unable to determine if this is a ESXi Host: %s, username: %s" % (HOST, USER)
+        print "Unable to determine if this is a ESXi Host: %s, port: %s, username: %s" % (HOST, PORT, USER)
         sys.exit(1)
 except:
     print "The Error is " + str(sys.exc_info()[0])
-    print "Unable to access ESXi Host: %s, username: %s" % (HOST, USER)
+    print "Unable to access ESXi Host: %s, port: %s, username: %s" % (HOST, PORT, USER)
     sys.exit(1)
 
 #
@@ -447,6 +453,7 @@ if not isDryRun and not CheckHasErrors:
 #
 #   The output log string
 LogOutput += '"Host":"' + HOST + '",'
+LogOutput += '"Port":"' + PORT + '",'
 LogOutput += '"Name":"' + NAME + '",'
 LogOutput += '"CPU":"' + str(CPU) + '",'
 LogOutput += '"Mem":"' + str(MEM) + '",'
@@ -482,6 +489,7 @@ if isSummary:
 
     if isVerbose:
         print "ESXi Host: " + HOST
+        print "ESXi Port: " + PORT
     print "VM NAME: " + NAME
     print "vCPU: " + str(CPU)
     print "Memory: " + str(MEM) + "GB"
diff --git a/esxi_vm_functions.py b/esxi_vm_functions.py
index bdd165c..c7ab32b 100755
--- a/esxi_vm_functions.py
+++ b/esxi_vm_functions.py
@@ -1,7 +1,6 @@
 import os.path
 import yaml
 import datetime                   # For current Date/Time
-import paramiko                   # For remote ssh
 from math import log
 
 
@@ -31,10 +30,12 @@ def setup_config():
         #  Enable/Disable exit summary by default
         isSummary=False,
 
-        #  ESXi host/IP, root login & password
+        #  ESXi host/IP, port, root login & password
         HOST="esxi",
+        PORT=22,
         USER="root",
         PASSWORD="",
+        KEY="",
 
         #  Default number of vCPU's, GB Mem, & GB boot disk
         CPU=2,