mirror of https://github.com/Kodomo/esxi-vm
PEP8 conformity
parent
aa5960eec6
commit
dd097e6ed1
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
|
|
||||||
import argparse # Argument parser
|
import argparse # Argument parser
|
||||||
import sys # For args
|
|
||||||
import re # For regex
|
import re # For regex
|
||||||
import paramiko # For remote ssh
|
import paramiko # For remote ssh
|
||||||
|
|
||||||
|
@ -46,7 +45,8 @@ FullPathExists = False
|
||||||
#
|
#
|
||||||
parser = argparse.ArgumentParser(description='ESXi Create VM utility.')
|
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('-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("-H", "--Host", dest='HOST', type=str, help="ESXi Host/IP (" + str(HOST) + ")")
|
||||||
parser.add_argument("-T", "--Port", dest='PORT', type=int, help="ESXi Port number (" + str(PORT) + ")")
|
parser.add_argument("-T", "--Port", dest='PORT', type=int, help="ESXi Port number (" + str(PORT) + ")")
|
||||||
parser.add_argument("-U", "--User", dest='USER', type=str, help="ESXi Host username (" + str(USER) + ")")
|
parser.add_argument("-U", "--User", dest='USER', type=str, help="ESXi Host username (" + str(USER) + ")")
|
||||||
|
@ -62,10 +62,12 @@ parser.add_argument("-M", "--mac", dest='MAC', type=str, help="MAC address")
|
||||||
parser.add_argument("-S", "--store", dest='STORE', type=str, help="vmfs Store | LeastUsed (" + str(STORE) + ")")
|
parser.add_argument("-S", "--store", dest='STORE', type=str, help="vmfs Store | LeastUsed (" + str(STORE) + ")")
|
||||||
parser.add_argument("-g", "--guestos", dest='GUESTOS', type=str, help="Guest OS. (" + str(GUESTOS) + ")")
|
parser.add_argument("-g", "--guestos", dest='GUESTOS', type=str, help="Guest OS. (" + str(GUESTOS) + ")")
|
||||||
parser.add_argument("-o", "--options", dest='VMXOPTS', type=str, default='NIL', help="Comma list of VMX Options.")
|
parser.add_argument("-o", "--options", dest='VMXOPTS', type=str, default='NIL', help="Comma list of VMX Options.")
|
||||||
parser.add_argument('-V', '--verbose', dest='isVerbosearg', action='store_true', help="Enable Verbose mode (" + str(isVerbose) + ")")
|
parser.add_argument('-V', '--verbose', dest='isVerbosearg', action='store_true',
|
||||||
parser.add_argument('--summary', dest='isSummaryarg', action='store_true', help="Display Summary (" + str(isSummary) + ")")
|
help="Enable Verbose mode (" + str(isVerbose) + ")")
|
||||||
parser.add_argument("-u", "--updateDefaults", dest='UPDATE', action='store_true', help="Update Default VM settings stored in ~/.esxi-vm.yml")
|
parser.add_argument('--summary', dest='isSummaryarg', action='store_true',
|
||||||
# parser.add_argument("--showDefaults", dest='SHOW', action='store_true', help="Show Default VM settings stored in ~/.esxi-vm.yml")
|
help="Display Summary (" + str(isSummary) + ")")
|
||||||
|
parser.add_argument("-u", "--updateDefaults", dest='UPDATE', action='store_true',
|
||||||
|
help="Update Default VM settings stored in ~/.esxi-vm.yml")
|
||||||
|
|
||||||
|
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
@ -132,7 +134,7 @@ if args.UPDATE:
|
||||||
ConfigData['ISO'] = ISO
|
ConfigData['ISO'] = ISO
|
||||||
ConfigData['GUESTOS'] = GUESTOS
|
ConfigData['GUESTOS'] = GUESTOS
|
||||||
ConfigData['VMXOPTS'] = VMXOPTS
|
ConfigData['VMXOPTS'] = VMXOPTS
|
||||||
SaveConfig(ConfigData)
|
save_config(ConfigData)
|
||||||
if NAME == "":
|
if NAME == "":
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
|
|
||||||
|
@ -140,7 +142,7 @@ if args.UPDATE:
|
||||||
# main()
|
# main()
|
||||||
#
|
#
|
||||||
LogOutput = '{'
|
LogOutput = '{'
|
||||||
LogOutput += '"datetime":"' + str(theCurrDateTime()) + '",'
|
LogOutput += '"datetime":"' + str(the_current_date_time()) + '",'
|
||||||
|
|
||||||
if NAME == "":
|
if NAME == "":
|
||||||
print "ERROR: Missing required option --name"
|
print "ERROR: Missing required option --name"
|
||||||
|
@ -165,7 +167,8 @@ except:
|
||||||
# Get list of DataStores, store in VOLUMES
|
# Get list of DataStores, store in VOLUMES
|
||||||
#
|
#
|
||||||
try:
|
try:
|
||||||
(stdin, stdout, stderr) = ssh.exec_command("esxcli storage filesystem list |grep '/vmfs/volumes/.*true VMFS' |sort -nk7")
|
(stdin, stdout, stderr) = \
|
||||||
|
ssh.exec_command("esxcli storage filesystem list |grep '/vmfs/volumes/.*true VMFS' |sort -nk7")
|
||||||
type(stdin)
|
type(stdin)
|
||||||
VOLUMES = {}
|
VOLUMES = {}
|
||||||
for line in stdout.readlines():
|
for line in stdout.readlines():
|
||||||
|
@ -184,7 +187,8 @@ if STORE == "LeastUsed":
|
||||||
# Get list of Networks available, store in VMNICS
|
# Get list of Networks available, store in VMNICS
|
||||||
#
|
#
|
||||||
try:
|
try:
|
||||||
(stdin, stdout, stderr) = ssh.exec_command("esxcli network vswitch standard list|grep Portgroups|sed 's/^ Portgroups: //g'")
|
(stdin, stdout, stderr) = \
|
||||||
|
ssh.exec_command("esxcli network vswitch standard list|grep Portgroups|sed 's/^ Portgroups: //g'")
|
||||||
type(stdin)
|
type(stdin)
|
||||||
VMNICS = []
|
VMNICS = []
|
||||||
for line in stdout.readlines():
|
for line in stdout.readlines():
|
||||||
|
@ -221,7 +225,8 @@ if ISO != "":
|
||||||
try:
|
try:
|
||||||
# If ISO has no "/", try to find the ISO
|
# If ISO has no "/", try to find the ISO
|
||||||
if not re.match('/', ISO):
|
if not re.match('/', ISO):
|
||||||
(stdin, stdout, stderr) = ssh.exec_command("find /vmfs/volumes/ -type f -name " + ISO + " -exec sh -c 'echo $1; kill $PPID' sh {} 2>/dev/null \;")
|
(stdin, stdout, stderr) = ssh.exec_command("find /vmfs/volumes/ -type f -name " + ISO +
|
||||||
|
" -exec sh -c 'echo $1; kill $PPID' sh {} 2>/dev/null \;")
|
||||||
type(stdin)
|
type(stdin)
|
||||||
FoundISOPath = str(stdout.readlines()[0]).strip('\n')
|
FoundISOPath = str(stdout.readlines()[0]).strip('\n')
|
||||||
if isVerbose:
|
if isVerbose:
|
||||||
|
@ -417,7 +422,8 @@ if not isDryRun and not CheckHasErrors:
|
||||||
# Create vmdk
|
# Create vmdk
|
||||||
if isVerbose:
|
if isVerbose:
|
||||||
print "Create " + NAME + ".vmdk file"
|
print "Create " + NAME + ".vmdk file"
|
||||||
(stdin, stdout, stderr) = ssh.exec_command("vmkfstools -c " + str(HDISK) + "G -d " + DISKFORMAT + " " + MyVM + ".vmdk")
|
(stdin, stdout, stderr) = \
|
||||||
|
ssh.exec_command("vmkfstools -c " + str(HDISK) + "G -d " + DISKFORMAT + " " + MyVM + ".vmdk")
|
||||||
type(stdin)
|
type(stdin)
|
||||||
|
|
||||||
# Register VM
|
# Register VM
|
||||||
|
@ -473,7 +479,7 @@ LogOutput += '"Verbose":"' + str(isVerbose) + '",'
|
||||||
if ErrorMessages != "":
|
if ErrorMessages != "":
|
||||||
LogOutput += '"Error Message":"' + ErrorMessages + '",'
|
LogOutput += '"Error Message":"' + ErrorMessages + '",'
|
||||||
LogOutput += '"Result":"' + Result + '",'
|
LogOutput += '"Result":"' + Result + '",'
|
||||||
LogOutput += '"Completion Time":"' + str(theCurrDateTime()) + '"'
|
LogOutput += '"Completion Time":"' + str(the_current_date_time()) + '"'
|
||||||
LogOutput += '}\n'
|
LogOutput += '}\n'
|
||||||
try:
|
try:
|
||||||
with open(LOG, "a+w") as FD:
|
with open(LOG, "a+w") as FD:
|
||||||
|
|
Loading…
Reference in New Issue