Update vm.py to allow API use
This commit is contained in:
parent
9e806d30f9
commit
73443ecbaf
|
@ -173,7 +173,7 @@ def node_info(node, long_output):
|
||||||
zk_conn = pvc_common.startZKConnection(zk_host)
|
zk_conn = pvc_common.startZKConnection(zk_host)
|
||||||
retcode, retdata = pvc_node.get_info(zk_conn, node)
|
retcode, retdata = pvc_node.get_info(zk_conn, node)
|
||||||
if retcode:
|
if retcode:
|
||||||
pvc_node.format_info(zk_conn, retdata, long_output)
|
pvc_node.format_info(retdata, long_output)
|
||||||
if long_output:
|
if long_output:
|
||||||
click.echo('{}Virtual machines on node:{}'.format(ansiprint.bold(), ansiprint.end()))
|
click.echo('{}Virtual machines on node:{}'.format(ansiprint.bold(), ansiprint.end()))
|
||||||
click.echo('')
|
click.echo('')
|
||||||
|
@ -404,7 +404,7 @@ def vm_undefine(domain):
|
||||||
|
|
||||||
# Open a Zookeeper connection
|
# Open a Zookeeper connection
|
||||||
zk_conn = pvc_common.startZKConnection(zk_host)
|
zk_conn = pvc_common.startZKConnection(zk_host)
|
||||||
retcode, retmsg = pvc_vm.undefine_vm(zk_conn, domain)
|
retcode, retmsg = pvc_vm.undefine_vm(zk_conn, domain, is_cli=True)
|
||||||
cleanup(retcode, retmsg, zk_conn)
|
cleanup(retcode, retmsg, zk_conn)
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
@ -550,7 +550,7 @@ def vm_migrate(domain, target_node, selector, force_migrate):
|
||||||
|
|
||||||
# Open a Zookeeper connection
|
# Open a Zookeeper connection
|
||||||
zk_conn = pvc_common.startZKConnection(zk_host)
|
zk_conn = pvc_common.startZKConnection(zk_host)
|
||||||
retcode, retmsg = pvc_vm.migrate_vm(zk_conn, domain, target_node, selector, force_migrate)
|
retcode, retmsg = pvc_vm.migrate_vm(zk_conn, domain, target_node, selector, force_migrate, is_cli=True)
|
||||||
cleanup(retcode, retmsg, zk_conn)
|
cleanup(retcode, retmsg, zk_conn)
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
@ -586,10 +586,13 @@ def vm_info(domain, long_output):
|
||||||
Show information about virtual machine DOMAIN. DOMAIN may be a UUID or name.
|
Show information about virtual machine DOMAIN. DOMAIN may be a UUID or name.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# Open a Zookeeper connection
|
|
||||||
zk_conn = pvc_common.startZKConnection(zk_host)
|
zk_conn = pvc_common.startZKConnection(zk_host)
|
||||||
retcode, retmsg = pvc_vm.get_info(zk_conn, domain, long_output)
|
retcode, retdata = pvc_vm.get_info(zk_conn, domain)
|
||||||
cleanup(retcode, retmsg, zk_conn)
|
if retcode:
|
||||||
|
pvc_vm.format_info(zk_conn, retdata, long_output)
|
||||||
|
retdata = ''
|
||||||
|
cleanup(retcode, retdata, zk_conn)
|
||||||
|
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# pvc vm log
|
# pvc vm log
|
||||||
|
@ -649,8 +652,11 @@ def vm_list(target_node, target_state, limit, raw):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
zk_conn = pvc_common.startZKConnection(zk_host)
|
zk_conn = pvc_common.startZKConnection(zk_host)
|
||||||
retcode, retmsg = pvc_vm.get_list(zk_conn, target_node, target_state, limit, raw)
|
retcode, retdata = pvc_vm.get_list(zk_conn, target_node, target_state, limit)
|
||||||
cleanup(retcode, retmsg, zk_conn)
|
if retcode:
|
||||||
|
pvc_vm.format_list(zk_conn, retdata, raw)
|
||||||
|
retdata = ''
|
||||||
|
cleanup(retcode, retdata, zk_conn)
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# pvc network
|
# pvc network
|
||||||
|
|
|
@ -207,7 +207,7 @@ def get_info(zk_conn, node):
|
||||||
# Get information about node in a pretty format
|
# Get information about node in a pretty format
|
||||||
node_information = getInformationFromNode(zk_conn, node)
|
node_information = getInformationFromNode(zk_conn, node)
|
||||||
if node_information == None:
|
if node_information == None:
|
||||||
return False, 'ERROR: Could not find a node matching that name.'
|
return False, 'ERROR: Could not get information about node "{}".'.format(node)
|
||||||
|
|
||||||
return True, node_information
|
return True, node_information
|
||||||
|
|
||||||
|
@ -262,7 +262,7 @@ def getOutputColours(node_information):
|
||||||
|
|
||||||
return daemon_state_colour, coordinator_state_colour, domain_state_colour
|
return daemon_state_colour, coordinator_state_colour, domain_state_colour
|
||||||
|
|
||||||
def format_info(zk_conn, node_information, long_output):
|
def format_info(node_information, long_output):
|
||||||
daemon_state_colour, coordinator_state_colour, domain_state_colour = getOutputColours(node_information)
|
daemon_state_colour, coordinator_state_colour, domain_state_colour = getOutputColours(node_information)
|
||||||
|
|
||||||
# Format a nice output; do this line-by-line then concat the elements at the end
|
# Format a nice output; do this line-by-line then concat the elements at the end
|
||||||
|
|
|
@ -42,105 +42,60 @@ import client_lib.common as common
|
||||||
#
|
#
|
||||||
# XML information parsing functions
|
# XML information parsing functions
|
||||||
#
|
#
|
||||||
def getInformationFromXML(zk_conn, uuid, long_output):
|
def getInformationFromXML(zk_conn, uuid):
|
||||||
# Obtain the contents of the XML from Zookeeper
|
"""
|
||||||
try:
|
Gather information about a VM from the Libvirt XML configuration in the Zookeper database
|
||||||
dstate = zkhandler.readdata(zk_conn, '/domains/{}/state'.format(uuid))
|
and return a dict() containing it.
|
||||||
dnode = zkhandler.readdata(zk_conn, '/domains/{}/node'.format(uuid))
|
"""
|
||||||
dlastnode = zkhandler.readdata(zk_conn, '/domains/{}/lastnode'.format(uuid))
|
domain_state = zkhandler.readdata(zk_conn, '/domains/{}/state'.format(uuid))
|
||||||
except:
|
domain_node = zkhandler.readdata(zk_conn, '/domains/{}/node'.format(uuid))
|
||||||
return None
|
domain_lastnode = zkhandler.readdata(zk_conn, '/domains/{}/lastnode'.format(uuid))
|
||||||
|
domain_failedreason = zkhandler.readdata(zk_conn, '/domains/{}/failedreason'.format(uuid))
|
||||||
|
|
||||||
if dlastnode == '':
|
if domain_lastnode == '':
|
||||||
dlastnode = 'N/A'
|
domain_lastnode = 'N/A'
|
||||||
|
|
||||||
parsed_xml = common.getDomainXML(zk_conn, uuid)
|
parsed_xml = common.getDomainXML(zk_conn, uuid)
|
||||||
duuid, dname, ddescription, dmemory, dvcpu, dvcputopo = common.getDomainMainDetails(parsed_xml)
|
|
||||||
dnets = common.getDomainNetworks(parsed_xml)
|
|
||||||
|
|
||||||
if long_output == True:
|
domain_uuid, domain_name, domain_description, domain_memory, domain_vcpu, domain_vcputopo = common.getDomainMainDetails(parsed_xml)
|
||||||
dtype, darch, dmachine, dconsole, demulator = common.getDomainExtraDetails(parsed_xml)
|
domain_networks = common.getDomainNetworks(parsed_xml)
|
||||||
dfeatures = common.getDomainCPUFeatures(parsed_xml)
|
|
||||||
ddisks = common.getDomainDisks(parsed_xml)
|
|
||||||
dcontrollers = common.getDomainControllers(parsed_xml)
|
|
||||||
|
|
||||||
# Format a nice output; do this line-by-line then concat the elements at the end
|
domain_type, domain_arch, domain_machine, domain_console, domain_emulator = common.getDomainExtraDetails(parsed_xml)
|
||||||
ainformation = []
|
|
||||||
ainformation.append('{}Virtual machine information:{}'.format(ansiprint.bold(), ansiprint.end()))
|
|
||||||
ainformation.append('')
|
|
||||||
# Basic information
|
|
||||||
ainformation.append('{}UUID:{} {}'.format(ansiprint.purple(), ansiprint.end(), duuid))
|
|
||||||
ainformation.append('{}Name:{} {}'.format(ansiprint.purple(), ansiprint.end(), dname))
|
|
||||||
ainformation.append('{}Description:{} {}'.format(ansiprint.purple(), ansiprint.end(), ddescription))
|
|
||||||
ainformation.append('{}Memory (M):{} {}'.format(ansiprint.purple(), ansiprint.end(), dmemory))
|
|
||||||
ainformation.append('{}vCPUs:{} {}'.format(ansiprint.purple(), ansiprint.end(), dvcpu))
|
|
||||||
ainformation.append('{}Topology (S/C/T):{} {}'.format(ansiprint.purple(), ansiprint.end(), dvcputopo))
|
|
||||||
|
|
||||||
if long_output == True:
|
domain_features = common.getDomainCPUFeatures(parsed_xml)
|
||||||
# Virtualization information
|
domain_disks = common.getDomainDisks(parsed_xml)
|
||||||
ainformation.append('')
|
domain_controllers = common.getDomainControllers(parsed_xml)
|
||||||
ainformation.append('{}Emulator:{} {}'.format(ansiprint.purple(), ansiprint.end(), demulator))
|
|
||||||
ainformation.append('{}Type:{} {}'.format(ansiprint.purple(), ansiprint.end(), dtype))
|
if domain_lastnode != '':
|
||||||
ainformation.append('{}Arch:{} {}'.format(ansiprint.purple(), ansiprint.end(), darch))
|
domain_migrated = 'from {}'.format(domain_lastnode)
|
||||||
ainformation.append('{}Machine:{} {}'.format(ansiprint.purple(), ansiprint.end(), dmachine))
|
else:
|
||||||
ainformation.append('{}Features:{} {}'.format(ansiprint.purple(), ansiprint.end(), ' '.join(dfeatures)))
|
domain_migrated = 'no'
|
||||||
|
|
||||||
# PVC cluster information
|
domain_information = {
|
||||||
ainformation.append('')
|
'name': domain_name,
|
||||||
dstate_colour = {
|
'uuid': domain_uuid,
|
||||||
'start': ansiprint.green(),
|
'state': domain_state,
|
||||||
'restart': ansiprint.yellow(),
|
'node': domain_node,
|
||||||
'shutdown': ansiprint.yellow(),
|
'last_node': domain_lastnode,
|
||||||
'stop': ansiprint.red(),
|
'migrated': domain_migrated,
|
||||||
'failed': ansiprint.red(),
|
'failed_reason': domain_failedreason,
|
||||||
'migrate': ansiprint.blue(),
|
'description': domain_description,
|
||||||
'unmigrate': ansiprint.blue()
|
'memory': domain_memory,
|
||||||
|
'vcpu': domain_vcpu,
|
||||||
|
'vcpu_topology': domain_vcputopo,
|
||||||
|
'networks': domain_networks,
|
||||||
|
'type': domain_type,
|
||||||
|
'arch': domain_arch,
|
||||||
|
'machine': domain_machine,
|
||||||
|
'console': domain_console,
|
||||||
|
'emulator': domain_emulator,
|
||||||
|
'features': domain_features,
|
||||||
|
'disks': domain_disks,
|
||||||
|
'controllers': domain_controllers
|
||||||
}
|
}
|
||||||
ainformation.append('{}State:{} {}{}{}'.format(ansiprint.purple(), ansiprint.end(), dstate_colour[dstate], dstate, ansiprint.end()))
|
|
||||||
ainformation.append('{}Current Node:{} {}'.format(ansiprint.purple(), ansiprint.end(), dnode))
|
|
||||||
ainformation.append('{}Previous Node:{} {}'.format(ansiprint.purple(), ansiprint.end(), dlastnode))
|
|
||||||
|
|
||||||
# Network list
|
return domain_information
|
||||||
net_list = []
|
|
||||||
for net in dnets:
|
|
||||||
# Split out just the numerical (VNI) part of the brXXXX name
|
|
||||||
net_vnis = re.findall(r'\d+', net['source'])
|
|
||||||
if net_vnis:
|
|
||||||
net_vni = net_vnis[0]
|
|
||||||
else:
|
|
||||||
net_vni = re.sub('br', '', net['source'])
|
|
||||||
net_exists = zkhandler.exists(zk_conn, '/networks/{}'.format(net_vni))
|
|
||||||
if not net_exists and net_vni != 'cluster':
|
|
||||||
net_list.append(ansiprint.red() + net_vni + ansiprint.end() + ' [invalid]')
|
|
||||||
else:
|
|
||||||
net_list.append(net_vni)
|
|
||||||
ainformation.append('')
|
|
||||||
ainformation.append('{}Networks:{} {}'.format(ansiprint.purple(), ansiprint.end(), ', '.join(net_list)))
|
|
||||||
|
|
||||||
if long_output == True:
|
|
||||||
# Disk list
|
|
||||||
ainformation.append('')
|
|
||||||
name_length = 0
|
|
||||||
for disk in ddisks:
|
|
||||||
_name_length = len(disk['name']) + 1
|
|
||||||
if _name_length > name_length:
|
|
||||||
name_length = _name_length
|
|
||||||
ainformation.append('{0}Disks:{1} {2}ID Type {3: <{width}} Dev Bus{4}'.format(ansiprint.purple(), ansiprint.end(), ansiprint.bold(), 'Name', ansiprint.end(), width=name_length))
|
|
||||||
for disk in ddisks:
|
|
||||||
ainformation.append(' {0: <3} {1: <5} {2: <{width}} {3: <4} {4: <5}'.format(ddisks.index(disk), disk['type'], disk['name'], disk['dev'], disk['bus'], width=name_length))
|
|
||||||
ainformation.append('')
|
|
||||||
ainformation.append('{}Interfaces:{} {}ID Type Source Model MAC{}'.format(ansiprint.purple(), ansiprint.end(), ansiprint.bold(), ansiprint.end()))
|
|
||||||
for net in dnets:
|
|
||||||
ainformation.append(' {0: <3} {1: <8} {2: <10} {3: <8} {4}'.format(dnets.index(net), net['type'], net['source'], net['model'], net['mac']))
|
|
||||||
# Controller list
|
|
||||||
ainformation.append('')
|
|
||||||
ainformation.append('{}Controllers:{} {}ID Type Model{}'.format(ansiprint.purple(), ansiprint.end(), ansiprint.bold(), ansiprint.end()))
|
|
||||||
for controller in dcontrollers:
|
|
||||||
ainformation.append(' {0: <3} {1: <14} {2: <8}'.format(dcontrollers.index(controller), controller['type'], controller['model']))
|
|
||||||
|
|
||||||
# Join it all together
|
|
||||||
information = '\n'.join(ainformation)
|
|
||||||
return information
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -213,7 +168,6 @@ def define_vm(zk_conn, config_data, target_node, selector):
|
||||||
parsed_xml = lxml.objectify.fromstring(config_data)
|
parsed_xml = lxml.objectify.fromstring(config_data)
|
||||||
dom_uuid = parsed_xml.uuid.text
|
dom_uuid = parsed_xml.uuid.text
|
||||||
dom_name = parsed_xml.name.text
|
dom_name = parsed_xml.name.text
|
||||||
click.echo('Adding new VM with Name "{}" and UUID "{}" to database.'.format(dom_name, dom_uuid))
|
|
||||||
|
|
||||||
if target_node == None:
|
if target_node == None:
|
||||||
target_node = common.findTargetNode(zk_conn, selector, dom_uuid)
|
target_node = common.findTargetNode(zk_conn, selector, dom_uuid)
|
||||||
|
@ -232,7 +186,7 @@ def define_vm(zk_conn, config_data, target_node, selector):
|
||||||
'/domains/{}/xml'.format(dom_uuid): config_data
|
'/domains/{}/xml'.format(dom_uuid): config_data
|
||||||
})
|
})
|
||||||
|
|
||||||
return True, ''
|
return True, 'Added new VM with Name "{}" and UUID "{}" to database.'.format(dom_name, dom_uuid)
|
||||||
|
|
||||||
def modify_vm(zk_conn, domain, restart, new_vm_config):
|
def modify_vm(zk_conn, domain, restart, new_vm_config):
|
||||||
dom_uuid = getDomainUUID(zk_conn, domain)
|
dom_uuid = getDomainUUID(zk_conn, domain)
|
||||||
|
@ -258,11 +212,10 @@ def dump_vm(zk_conn, domain):
|
||||||
|
|
||||||
# Gram the domain XML and dump it to stdout
|
# Gram the domain XML and dump it to stdout
|
||||||
vm_xml = zkhandler.readdata(zk_conn, '/domains/{}/xml'.format(dom_uuid))
|
vm_xml = zkhandler.readdata(zk_conn, '/domains/{}/xml'.format(dom_uuid))
|
||||||
click.echo(vm_xml)
|
|
||||||
|
|
||||||
return True, ''
|
return True, vm_xml
|
||||||
|
|
||||||
def undefine_vm(zk_conn, domain):
|
def undefine_vm(zk_conn, domain, is_cli=False):
|
||||||
# Validate and obtain alternate passed value
|
# Validate and obtain alternate passed value
|
||||||
dom_uuid = getDomainUUID(zk_conn, domain)
|
dom_uuid = getDomainUUID(zk_conn, domain)
|
||||||
if not dom_uuid:
|
if not dom_uuid:
|
||||||
|
@ -273,32 +226,36 @@ def undefine_vm(zk_conn, domain):
|
||||||
try:
|
try:
|
||||||
current_vm_state = zkhandler.readdata(zk_conn, '/domains/{}/state'.format(dom_uuid))
|
current_vm_state = zkhandler.readdata(zk_conn, '/domains/{}/state'.format(dom_uuid))
|
||||||
if current_vm_state != 'stop':
|
if current_vm_state != 'stop':
|
||||||
click.echo('Forcibly stopping VM "{}".'.format(dom_uuid))
|
if is_cli:
|
||||||
|
click.echo('Forcibly stopping VM "{}".'.format(dom_uuid))
|
||||||
# Set the domain into stop mode
|
# Set the domain into stop mode
|
||||||
zkhandler.writedata(zk_conn, {'/domains/{}/state'.format(dom_uuid): 'stop'})
|
zkhandler.writedata(zk_conn, {'/domains/{}/state'.format(dom_uuid): 'stop'})
|
||||||
|
|
||||||
# Wait for 3 seconds to allow state to flow to all nodes
|
# Wait for 1 second to allow state to flow to all nodes
|
||||||
click.echo('Waiting for cluster to update.')
|
if is_cli:
|
||||||
time.sleep(1)
|
click.echo('Waiting for cluster to update.')
|
||||||
|
time.sleep(2)
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# Gracefully terminate the class instances
|
# Gracefully terminate the class instances
|
||||||
try:
|
try:
|
||||||
click.echo('Deleting VM "{}" from nodes.'.format(dom_uuid))
|
if is_cli:
|
||||||
|
click.echo('Deleting VM "{}" from nodes.'.format(dom_uuid))
|
||||||
zkhandler.writedata(zk_conn, {'/domains/{}/state'.format(dom_uuid): 'delete'})
|
zkhandler.writedata(zk_conn, {'/domains/{}/state'.format(dom_uuid): 'delete'})
|
||||||
time.sleep(5)
|
time.sleep(2)
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# Delete the configurations
|
# Delete the configurations
|
||||||
try:
|
try:
|
||||||
click.echo('Undefining VM "{}".'.format(dom_uuid))
|
if is_cli:
|
||||||
|
click.echo('Undefining VM "{}".'.format(dom_uuid))
|
||||||
zkhandler.deletekey(zk_conn, '/domains/{}'.format(dom_uuid))
|
zkhandler.deletekey(zk_conn, '/domains/{}'.format(dom_uuid))
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
return True, ''
|
return True, 'Removed VM "{}" from the cluster.'.format(dom_uuid)
|
||||||
|
|
||||||
def start_vm(zk_conn, domain):
|
def start_vm(zk_conn, domain):
|
||||||
# Validate and obtain alternate passed value
|
# Validate and obtain alternate passed value
|
||||||
|
@ -308,10 +265,9 @@ def start_vm(zk_conn, domain):
|
||||||
return False, 'ERROR: Could not find VM "{}" in the cluster!'.format(domain)
|
return False, 'ERROR: Could not find VM "{}" in the cluster!'.format(domain)
|
||||||
|
|
||||||
# Set the VM to start
|
# Set the VM to start
|
||||||
click.echo('Starting VM "{}".'.format(dom_uuid))
|
|
||||||
zkhandler.writedata(zk_conn, {'/domains/{}/state'.format(dom_uuid): 'start'})
|
zkhandler.writedata(zk_conn, {'/domains/{}/state'.format(dom_uuid): 'start'})
|
||||||
|
|
||||||
return True, ''
|
return True, 'Starting VM "{}".'.format(dom_uuid)
|
||||||
|
|
||||||
def restart_vm(zk_conn, domain):
|
def restart_vm(zk_conn, domain):
|
||||||
# Validate and obtain alternate passed value
|
# Validate and obtain alternate passed value
|
||||||
|
@ -327,10 +283,9 @@ def restart_vm(zk_conn, domain):
|
||||||
return False, 'ERROR: VM "{}" is not in "start" state!'.format(dom_uuid)
|
return False, 'ERROR: VM "{}" is not in "start" state!'.format(dom_uuid)
|
||||||
|
|
||||||
# Set the VM to start
|
# Set the VM to start
|
||||||
click.echo('Restarting VM "{}".'.format(dom_uuid))
|
|
||||||
zkhandler.writedata(zk_conn, {'/domains/{}/state'.format(dom_uuid): 'restart'})
|
zkhandler.writedata(zk_conn, {'/domains/{}/state'.format(dom_uuid): 'restart'})
|
||||||
|
|
||||||
return True, ''
|
return True, 'Restarting VM "{}".'.format(dom_uuid)
|
||||||
|
|
||||||
def shutdown_vm(zk_conn, domain):
|
def shutdown_vm(zk_conn, domain):
|
||||||
# Validate and obtain alternate passed value
|
# Validate and obtain alternate passed value
|
||||||
|
@ -345,10 +300,9 @@ def shutdown_vm(zk_conn, domain):
|
||||||
return False, 'ERROR: VM "{}" is not in "start" state!'.format(dom_uuid)
|
return False, 'ERROR: VM "{}" is not in "start" state!'.format(dom_uuid)
|
||||||
|
|
||||||
# Set the VM to shutdown
|
# Set the VM to shutdown
|
||||||
click.echo('Shutting down VM "{}".'.format(dom_uuid))
|
|
||||||
zkhandler.writedata(zk_conn, {'/domains/{}/state'.format(dom_uuid): 'shutdown'})
|
zkhandler.writedata(zk_conn, {'/domains/{}/state'.format(dom_uuid): 'shutdown'})
|
||||||
|
|
||||||
return True, ''
|
return True, 'Shutting down VM "{}".'.format(dom_uuid)
|
||||||
|
|
||||||
def stop_vm(zk_conn, domain):
|
def stop_vm(zk_conn, domain):
|
||||||
# Validate and obtain alternate passed value
|
# Validate and obtain alternate passed value
|
||||||
|
@ -361,10 +315,9 @@ def stop_vm(zk_conn, domain):
|
||||||
current_state = zkhandler.readdata(zk_conn, '/domains/{}/state'.format(dom_uuid))
|
current_state = zkhandler.readdata(zk_conn, '/domains/{}/state'.format(dom_uuid))
|
||||||
|
|
||||||
# Set the VM to start
|
# Set the VM to start
|
||||||
click.echo('Forcibly stopping VM "{}".'.format(dom_uuid))
|
|
||||||
zkhandler.writedata(zk_conn, {'/domains/{}/state'.format(dom_uuid): 'stop'})
|
zkhandler.writedata(zk_conn, {'/domains/{}/state'.format(dom_uuid): 'stop'})
|
||||||
|
|
||||||
return True, ''
|
return True, 'Forcibly stopping VM "{}".'.format(dom_uuid)
|
||||||
|
|
||||||
def move_vm(zk_conn, domain, target_node, selector):
|
def move_vm(zk_conn, domain, target_node, selector):
|
||||||
# Validate and obtain alternate passed value
|
# Validate and obtain alternate passed value
|
||||||
|
@ -387,22 +340,20 @@ def move_vm(zk_conn, domain, target_node, selector):
|
||||||
|
|
||||||
current_vm_state = zkhandler.readdata(zk_conn, '/domains/{}/state'.format(dom_uuid))
|
current_vm_state = zkhandler.readdata(zk_conn, '/domains/{}/state'.format(dom_uuid))
|
||||||
if current_vm_state == 'start':
|
if current_vm_state == 'start':
|
||||||
click.echo('Permanently migrating VM "{}" to node "{}".'.format(dom_uuid, target_node))
|
|
||||||
zkhandler.writedata(zk_conn, {
|
zkhandler.writedata(zk_conn, {
|
||||||
'/domains/{}/state'.format(dom_uuid): 'migrate',
|
'/domains/{}/state'.format(dom_uuid): 'migrate',
|
||||||
'/domains/{}/node'.format(dom_uuid): target_node,
|
'/domains/{}/node'.format(dom_uuid): target_node,
|
||||||
'/domains/{}/lastnode'.format(dom_uuid): ''
|
'/domains/{}/lastnode'.format(dom_uuid): ''
|
||||||
})
|
})
|
||||||
else:
|
else:
|
||||||
click.echo('Permanently moving VM "{}" to node "{}".'.format(dom_uuid, target_node))
|
|
||||||
zkhandler.writedata(zk_conn, {
|
zkhandler.writedata(zk_conn, {
|
||||||
'/domains/{}/node'.format(dom_uuid): target_node,
|
'/domains/{}/node'.format(dom_uuid): target_node,
|
||||||
'/domains/{}/lastnode'.format(dom_uuid): ''
|
'/domains/{}/lastnode'.format(dom_uuid): ''
|
||||||
})
|
})
|
||||||
|
|
||||||
return True, ''
|
return True, 'Permanently migrating VM "{}" to node "{}".'.format(dom_uuid, target_node)
|
||||||
|
|
||||||
def migrate_vm(zk_conn, domain, target_node, selector, force_migrate):
|
def migrate_vm(zk_conn, domain, target_node, selector, force_migrate, is_cli=False):
|
||||||
# Validate and obtain alternate passed value
|
# Validate and obtain alternate passed value
|
||||||
dom_uuid = getDomainUUID(zk_conn, domain)
|
dom_uuid = getDomainUUID(zk_conn, domain)
|
||||||
if not dom_uuid:
|
if not dom_uuid:
|
||||||
|
@ -420,12 +371,14 @@ def migrate_vm(zk_conn, domain, target_node, selector, force_migrate):
|
||||||
last_node = zkhandler.readdata(zk_conn, '/domains/{}/lastnode'.format(dom_uuid))
|
last_node = zkhandler.readdata(zk_conn, '/domains/{}/lastnode'.format(dom_uuid))
|
||||||
|
|
||||||
if last_node != '' and force_migrate != True:
|
if last_node != '' and force_migrate != True:
|
||||||
click.echo('ERROR: VM "{}" has been previously migrated.'.format(dom_uuid))
|
if is_cli:
|
||||||
click.echo('> Last node: {}'.format(last_node))
|
click.echo('ERROR: VM "{}" has been previously migrated.'.format(dom_uuid))
|
||||||
click.echo('> Current node: {}'.format(current_node))
|
click.echo('> Last node: {}'.format(last_node))
|
||||||
click.echo('Run `vm unmigrate` to restore the VM to its previous node, or use `--force` to override this check.')
|
click.echo('> Current node: {}'.format(current_node))
|
||||||
common.stopZKConnection(zk_conn)
|
click.echo('Run `vm unmigrate` to restore the VM to its previous node, or use `--force` to override this check.')
|
||||||
return False, ''
|
return False, ''
|
||||||
|
else:
|
||||||
|
return False, 'ERROR: VM "{}" has been previously migrated.'.format(dom_uuid)
|
||||||
|
|
||||||
if target_node == None:
|
if target_node == None:
|
||||||
target_node = common.findTargetNode(zk_conn, selector, dom_uuid)
|
target_node = common.findTargetNode(zk_conn, selector, dom_uuid)
|
||||||
|
@ -437,14 +390,13 @@ def migrate_vm(zk_conn, domain, target_node, selector, force_migrate):
|
||||||
# Verify node is valid
|
# Verify node is valid
|
||||||
common.verifyNode(zk_conn, target_node)
|
common.verifyNode(zk_conn, target_node)
|
||||||
|
|
||||||
click.echo('Migrating VM "{}" to node "{}".'.format(dom_uuid, target_node))
|
|
||||||
zkhandler.writedata(zk_conn, {
|
zkhandler.writedata(zk_conn, {
|
||||||
'/domains/{}/state'.format(dom_uuid): 'migrate',
|
'/domains/{}/state'.format(dom_uuid): 'migrate',
|
||||||
'/domains/{}/node'.format(dom_uuid): target_node,
|
'/domains/{}/node'.format(dom_uuid): target_node,
|
||||||
'/domains/{}/lastnode'.format(dom_uuid): current_node
|
'/domains/{}/lastnode'.format(dom_uuid): current_node
|
||||||
})
|
})
|
||||||
|
|
||||||
return True, ''
|
return True, 'Migrating VM "{}" to node "{}".'.format(dom_uuid, target_node)
|
||||||
|
|
||||||
def unmigrate_vm(zk_conn, domain):
|
def unmigrate_vm(zk_conn, domain):
|
||||||
# Validate and obtain alternate passed value
|
# Validate and obtain alternate passed value
|
||||||
|
@ -467,35 +419,13 @@ def unmigrate_vm(zk_conn, domain):
|
||||||
common.stopZKConnection(zk_conn)
|
common.stopZKConnection(zk_conn)
|
||||||
return False, 'ERROR: VM "{}" has not been previously migrated.'.format(dom_uuid)
|
return False, 'ERROR: VM "{}" has not been previously migrated.'.format(dom_uuid)
|
||||||
|
|
||||||
click.echo('Unmigrating VM "{}" back to node "{}".'.format(dom_uuid, target_node))
|
|
||||||
zkhandler.writedata(zk_conn, {
|
zkhandler.writedata(zk_conn, {
|
||||||
'/domains/{}/state'.format(dom_uuid): target_state,
|
'/domains/{}/state'.format(dom_uuid): target_state,
|
||||||
'/domains/{}/node'.format(dom_uuid): target_node,
|
'/domains/{}/node'.format(dom_uuid): target_node,
|
||||||
'/domains/{}/lastnode'.format(dom_uuid): ''
|
'/domains/{}/lastnode'.format(dom_uuid): ''
|
||||||
})
|
})
|
||||||
|
|
||||||
return True, ''
|
return True, 'Unmigrating VM "{}" back to node "{}".'.format(dom_uuid, target_node)
|
||||||
|
|
||||||
def get_info(zk_conn, domain, long_output):
|
|
||||||
# Validate and obtain alternate passed value
|
|
||||||
dom_uuid = getDomainUUID(zk_conn, domain)
|
|
||||||
if not dom_uuid:
|
|
||||||
common.stopZKConnection(zk_conn)
|
|
||||||
return False, 'ERROR: Could not find VM "{}" in the cluster!'.format(domain)
|
|
||||||
|
|
||||||
# Gather information from XML config and print it
|
|
||||||
information = getInformationFromXML(zk_conn, dom_uuid, long_output)
|
|
||||||
click.echo(information)
|
|
||||||
|
|
||||||
# Get a failure reason if applicable
|
|
||||||
failedreason = zkhandler.readdata(zk_conn, '/domains/{}/failedreason'.format(dom_uuid))
|
|
||||||
if failedreason != '':
|
|
||||||
click.echo('')
|
|
||||||
click.echo('{}Failure reason:{} {}'.format(ansiprint.purple(), ansiprint.end(), failedreason))
|
|
||||||
|
|
||||||
click.echo('')
|
|
||||||
|
|
||||||
return True, ''
|
|
||||||
|
|
||||||
def get_console_log(zk_conn, domain, lines=1000):
|
def get_console_log(zk_conn, domain, lines=1000):
|
||||||
# Validate and obtain alternate passed value
|
# Validate and obtain alternate passed value
|
||||||
|
@ -562,7 +492,21 @@ def follow_console_log(zk_conn, domain, lines=10):
|
||||||
|
|
||||||
return True, ''
|
return True, ''
|
||||||
|
|
||||||
def get_list(zk_conn, node, state, limit, raw):
|
def get_info(zk_conn, domain):
|
||||||
|
# Validate and obtain alternate passed value
|
||||||
|
dom_uuid = getDomainUUID(zk_conn, domain)
|
||||||
|
if not dom_uuid:
|
||||||
|
common.stopZKConnection(zk_conn)
|
||||||
|
return False, 'ERROR: No VM named "{}" is present in the cluster.'.format(domain)
|
||||||
|
|
||||||
|
# Gather information from XML config and print it
|
||||||
|
domain_information = getInformationFromXML(zk_conn, dom_uuid)
|
||||||
|
if domain_information == None:
|
||||||
|
return False, 'ERROR: Could not get information about VM "{}".'.format(domain)
|
||||||
|
|
||||||
|
return True, domain_information
|
||||||
|
|
||||||
|
def get_list(zk_conn, node, state, limit):
|
||||||
if node != None:
|
if node != None:
|
||||||
# Verify node is valid
|
# Verify node is valid
|
||||||
common.verifyNode(zk_conn, node)
|
common.verifyNode(zk_conn, node)
|
||||||
|
@ -574,17 +518,6 @@ def get_list(zk_conn, node, state, limit, raw):
|
||||||
|
|
||||||
full_vm_list = zkhandler.listchildren(zk_conn, '/domains')
|
full_vm_list = zkhandler.listchildren(zk_conn, '/domains')
|
||||||
vm_list = []
|
vm_list = []
|
||||||
vm_list_output = []
|
|
||||||
|
|
||||||
vm_node = {}
|
|
||||||
vm_state = {}
|
|
||||||
vm_migrated = {}
|
|
||||||
vm_uuid = {}
|
|
||||||
vm_name = {}
|
|
||||||
vm_description = {}
|
|
||||||
vm_memory = {}
|
|
||||||
vm_vcpu = {}
|
|
||||||
vm_nets = {}
|
|
||||||
|
|
||||||
# Set our limit to a sensible regex
|
# Set our limit to a sensible regex
|
||||||
if limit != None:
|
if limit != None:
|
||||||
|
@ -598,6 +531,8 @@ def get_list(zk_conn, node, state, limit, raw):
|
||||||
return False, 'Regex Error: {}'.format(e)
|
return False, 'Regex Error: {}'.format(e)
|
||||||
|
|
||||||
# If we're limited, remove other nodes' VMs
|
# If we're limited, remove other nodes' VMs
|
||||||
|
vm_node = {}
|
||||||
|
vm_state = {}
|
||||||
for vm in full_vm_list:
|
for vm in full_vm_list:
|
||||||
# Check we don't match the limit
|
# Check we don't match the limit
|
||||||
name = zkhandler.readdata(zk_conn, '/domains/{}'.format(vm))
|
name = zkhandler.readdata(zk_conn, '/domains/{}'.format(vm))
|
||||||
|
@ -608,56 +543,127 @@ def get_list(zk_conn, node, state, limit, raw):
|
||||||
try:
|
try:
|
||||||
if re.match(limit, vm) != None:
|
if re.match(limit, vm) != None:
|
||||||
if node == None and state == None:
|
if node == None and state == None:
|
||||||
vm_list.append(vm)
|
vm_list.append(getInformationFromXML(zk_conn, vm))
|
||||||
else:
|
else:
|
||||||
if vm_node[vm] == node or vm_state[vm] == state:
|
if vm_node[vm] == node or vm_state[vm] == state:
|
||||||
vm_list.append(vm)
|
vm_list.append(getInformationFromXML(zk_conn, vm))
|
||||||
|
|
||||||
if re.match(limit, name) != None:
|
if re.match(limit, name) != None:
|
||||||
if node == None and state == None:
|
if node == None and state == None:
|
||||||
vm_list.append(vm)
|
vm_list.append(getInformationFromXML(zk_conn, vm))
|
||||||
else:
|
else:
|
||||||
if vm_node[vm] == node or vm_state[vm] == state:
|
if vm_node[vm] == node or vm_state[vm] == state:
|
||||||
vm_list.append(vm)
|
vm_list.append(getInformationFromXML(zk_conn, vm))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return False, 'Regex Error: {}'.format(e)
|
return False, 'Regex Error: {}'.format(e)
|
||||||
else:
|
else:
|
||||||
# Check node to avoid unneeded ZK calls
|
# Check node to avoid unneeded ZK calls
|
||||||
if node == None and state == None:
|
if node == None and state == None:
|
||||||
vm_list.append(vm)
|
vm_list.append(getInformationFromXML(zk_conn, vm))
|
||||||
else:
|
else:
|
||||||
if vm_node[vm] == node or vm_state[vm] == state:
|
if vm_node[vm] == node or vm_state[vm] == state:
|
||||||
vm_list.append(vm)
|
vm_list.append(getInformationFromXML(zk_conn, vm))
|
||||||
|
|
||||||
# Gather information for printing
|
return True, vm_list
|
||||||
for vm in vm_list:
|
|
||||||
vm_lastnode = zkhandler.readdata(zk_conn, '/domains/{}/lastnode'.format(vm))
|
#
|
||||||
if vm_lastnode != '':
|
# CLI-specific functions
|
||||||
vm_migrated[vm] = 'from {}'.format(vm_lastnode)
|
#
|
||||||
|
def format_info(zk_conn, domain_information, long_output):
|
||||||
|
# Format a nice output; do this line-by-line then concat the elements at the end
|
||||||
|
ainformation = []
|
||||||
|
ainformation.append('{}Virtual machine information:{}'.format(ansiprint.bold(), ansiprint.end()))
|
||||||
|
ainformation.append('')
|
||||||
|
# Basic information
|
||||||
|
ainformation.append('{}UUID:{} {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['uuid']))
|
||||||
|
ainformation.append('{}Name:{} {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['name']))
|
||||||
|
ainformation.append('{}Description:{} {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['description']))
|
||||||
|
ainformation.append('{}Memory (M):{} {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['memory']))
|
||||||
|
ainformation.append('{}vCPUs:{} {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['vcpu']))
|
||||||
|
ainformation.append('{}Topology (S/C/T):{} {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['vcpu_topology']))
|
||||||
|
|
||||||
|
if long_output == True:
|
||||||
|
# Virtualization information
|
||||||
|
ainformation.append('')
|
||||||
|
ainformation.append('{}Emulator:{} {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['emulator']))
|
||||||
|
ainformation.append('{}Type:{} {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['type']))
|
||||||
|
ainformation.append('{}Arch:{} {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['arch']))
|
||||||
|
ainformation.append('{}Machine:{} {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['machine']))
|
||||||
|
ainformation.append('{}Features:{} {}'.format(ansiprint.purple(), ansiprint.end(), ' '.join(domain_information['features'])))
|
||||||
|
|
||||||
|
# PVC cluster information
|
||||||
|
ainformation.append('')
|
||||||
|
dstate_colour = {
|
||||||
|
'start': ansiprint.green(),
|
||||||
|
'restart': ansiprint.yellow(),
|
||||||
|
'shutdown': ansiprint.yellow(),
|
||||||
|
'stop': ansiprint.red(),
|
||||||
|
'failed': ansiprint.red(),
|
||||||
|
'migrate': ansiprint.blue(),
|
||||||
|
'unmigrate': ansiprint.blue()
|
||||||
|
}
|
||||||
|
ainformation.append('{}State:{} {}{}{}'.format(ansiprint.purple(), ansiprint.end(), dstate_colour[domain_information['state']], domain_information['state'], ansiprint.end()))
|
||||||
|
ainformation.append('{}Current Node:{} {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['node']))
|
||||||
|
ainformation.append('{}Previous Node:{} {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['last_node']))
|
||||||
|
|
||||||
|
# Get a failure reason if applicable
|
||||||
|
if domain_information['failed_reason'] != '':
|
||||||
|
click.echo('')
|
||||||
|
click.echo('{}Failure reason:{} {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['failed_reason']))
|
||||||
|
|
||||||
|
# Network list
|
||||||
|
net_list = []
|
||||||
|
for net in domain_information['networks']:
|
||||||
|
# Split out just the numerical (VNI) part of the brXXXX name
|
||||||
|
net_vnis = re.findall(r'\d+', net['source'])
|
||||||
|
if net_vnis:
|
||||||
|
net_vni = net_vnis[0]
|
||||||
else:
|
else:
|
||||||
vm_migrated[vm] = 'no'
|
net_vni = re.sub('br', '', net['source'])
|
||||||
|
net_exists = zkhandler.exists(zk_conn, '/networks/{}'.format(net_vni))
|
||||||
|
if not net_exists and net_vni != 'cluster':
|
||||||
|
net_list.append(ansiprint.red() + net_vni + ansiprint.end() + ' [invalid]')
|
||||||
|
else:
|
||||||
|
net_list.append(net_vni)
|
||||||
|
ainformation.append('')
|
||||||
|
ainformation.append('{}Networks:{} {}'.format(ansiprint.purple(), ansiprint.end(), ', '.join(net_list)))
|
||||||
|
|
||||||
try:
|
if long_output == True:
|
||||||
vm_xml = common.getDomainXML(zk_conn, vm)
|
# Disk list
|
||||||
vm_uuid[vm], vm_name[vm], vm_description[vm], vm_memory[vm], vm_vcpu[vm], vm_vcputopo = common.getDomainMainDetails(vm_xml)
|
ainformation.append('')
|
||||||
dnets = common.getDomainNetworks(vm_xml)
|
name_length = 0
|
||||||
vm_nets[vm] = []
|
for disk in domain_information['disks']:
|
||||||
for net in dnets:
|
_name_length = len(disk['name']) + 1
|
||||||
# Split out just the numerical (VNI) part of the brXXXX name
|
if _name_length > name_length:
|
||||||
net_vnis = re.findall(r'\d+', net['source'])
|
name_length = _name_length
|
||||||
if net_vnis:
|
ainformation.append('{0}Disks:{1} {2}ID Type {3: <{width}} Dev Bus{4}'.format(ansiprint.purple(), ansiprint.end(), ansiprint.bold(), 'Name', ansiprint.end(), width=name_length))
|
||||||
net_vni = net_vnis[0]
|
for disk in domain_information['disks']:
|
||||||
else:
|
ainformation.append(' {0: <3} {1: <5} {2: <{width}} {3: <4} {4: <5}'.format(domain_information['disks'].index(disk), disk['type'], disk['name'], disk['dev'], disk['bus'], width=name_length))
|
||||||
net_vni = re.sub('br', '', net['source'])
|
ainformation.append('')
|
||||||
vm_nets[vm].append(net_vni)
|
ainformation.append('{}Interfaces:{} {}ID Type Source Model MAC{}'.format(ansiprint.purple(), ansiprint.end(), ansiprint.bold(), ansiprint.end()))
|
||||||
except AttributeError:
|
for net in domain_information['nets']:
|
||||||
click.echo('Error: Domain {} does not exist.'.format(domain))
|
ainformation.append(' {0: <3} {1: <8} {2: <10} {3: <8} {4}'.format(domain_information['nets'].index(net), net['type'], net['source'], net['model'], net['mac']))
|
||||||
|
# Controller list
|
||||||
|
ainformation.append('')
|
||||||
|
ainformation.append('{}Controllers:{} {}ID Type Model{}'.format(ansiprint.purple(), ansiprint.end(), ansiprint.bold(), ansiprint.end()))
|
||||||
|
for controller in domain_information['controllers']:
|
||||||
|
ainformation.append(' {0: <3} {1: <14} {2: <8}'.format(domain_information['controllers'].index(controller), controller['type'], controller['model']))
|
||||||
|
|
||||||
|
# Join it all together
|
||||||
|
information = '\n'.join(ainformation)
|
||||||
|
click.echo(information)
|
||||||
|
|
||||||
|
click.echo('')
|
||||||
|
|
||||||
|
def format_list(zk_conn, vm_list, raw):
|
||||||
|
# Handle raw mode since it just lists the names
|
||||||
if raw:
|
if raw:
|
||||||
for vm in sorted(vm_name.values()):
|
for vm in sorted(vm_name.values()):
|
||||||
click.echo(vm)
|
click.echo(vm)
|
||||||
return True, ''
|
return True, ''
|
||||||
|
|
||||||
|
vm_list_output = []
|
||||||
|
|
||||||
# Determine optimal column widths
|
# Determine optimal column widths
|
||||||
# Dynamic columns: node_name, node, migrated
|
# Dynamic columns: node_name, node, migrated
|
||||||
vm_name_length = 5
|
vm_name_length = 5
|
||||||
|
@ -668,25 +674,35 @@ def get_list(zk_conn, node, state, limit, raw):
|
||||||
vm_vcpu_length = 6
|
vm_vcpu_length = 6
|
||||||
vm_node_length = 8
|
vm_node_length = 8
|
||||||
vm_migrated_length = 10
|
vm_migrated_length = 10
|
||||||
for vm in vm_list:
|
for domain_information in vm_list:
|
||||||
|
# Network list
|
||||||
|
net_list = []
|
||||||
|
for net in domain_information['networks']:
|
||||||
|
# Split out just the numerical (VNI) part of the brXXXX name
|
||||||
|
net_vnis = re.findall(r'\d+', net['source'])
|
||||||
|
if net_vnis:
|
||||||
|
net_vni = net_vnis[0]
|
||||||
|
else:
|
||||||
|
net_vni = re.sub('br', '', net['source'])
|
||||||
|
net_list.append(net_vni)
|
||||||
# vm_name column
|
# vm_name column
|
||||||
_vm_name_length = len(vm_name[vm]) + 1
|
_vm_name_length = len(domain_information['name']) + 1
|
||||||
if _vm_name_length > vm_name_length:
|
if _vm_name_length > vm_name_length:
|
||||||
vm_name_length = _vm_name_length
|
vm_name_length = _vm_name_length
|
||||||
# vm_state column
|
# vm_state column
|
||||||
_vm_state_length = len(vm_state[vm]) + 1
|
_vm_state_length = len(domain_information['state']) + 1
|
||||||
if _vm_state_length > vm_state_length:
|
if _vm_state_length > vm_state_length:
|
||||||
vm_state_length = _vm_state_length
|
vm_state_length = _vm_state_length
|
||||||
# vm_nets column
|
# vm_nets column
|
||||||
_vm_nets_length = len(','.join(vm_nets[vm])) + 1
|
_vm_nets_length = len(','.join(net_list)) + 1
|
||||||
if _vm_nets_length > vm_nets_length:
|
if _vm_nets_length > vm_nets_length:
|
||||||
vm_nets_length = _vm_nets_length
|
vm_nets_length = _vm_nets_length
|
||||||
# vm_node column
|
# vm_node column
|
||||||
_vm_node_length = len(vm_node[vm]) + 1
|
_vm_node_length = len(domain_information['node']) + 1
|
||||||
if _vm_node_length > vm_node_length:
|
if _vm_node_length > vm_node_length:
|
||||||
vm_node_length = _vm_node_length
|
vm_node_length = _vm_node_length
|
||||||
# vm_migrated column
|
# vm_migrated column
|
||||||
_vm_migrated_length = len(vm_migrated[vm]) + 1
|
_vm_migrated_length = len(domain_information['migrated']) + 1
|
||||||
if _vm_migrated_length > vm_migrated_length:
|
if _vm_migrated_length > vm_migrated_length:
|
||||||
vm_migrated_length = _vm_migrated_length
|
vm_migrated_length = _vm_migrated_length
|
||||||
|
|
||||||
|
@ -722,34 +738,39 @@ def get_list(zk_conn, node, state, limit, raw):
|
||||||
)
|
)
|
||||||
|
|
||||||
# Format the string (elements)
|
# Format the string (elements)
|
||||||
for vm in vm_list:
|
for domain_information in vm_list:
|
||||||
if vm_state[vm] == 'start':
|
if domain_information['state'] == 'start':
|
||||||
vm_state_colour = ansiprint.green()
|
vm_state_colour = ansiprint.green()
|
||||||
elif vm_state[vm] == 'restart':
|
elif domain_information['state'] == 'restart':
|
||||||
vm_state_colour = ansiprint.yellow()
|
vm_state_colour = ansiprint.yellow()
|
||||||
elif vm_state[vm] == 'shutdown':
|
elif domain_information['state'] == 'shutdown':
|
||||||
vm_state_colour = ansiprint.yellow()
|
vm_state_colour = ansiprint.yellow()
|
||||||
elif vm_state[vm] == 'stop':
|
elif domain_information['state'] == 'stop':
|
||||||
vm_state_colour = ansiprint.red()
|
vm_state_colour = ansiprint.red()
|
||||||
elif vm_state[vm] == 'failed':
|
elif domain_information['state'] == 'failed':
|
||||||
vm_state_colour = ansiprint.red()
|
vm_state_colour = ansiprint.red()
|
||||||
else:
|
else:
|
||||||
vm_state_colour = ansiprint.blue()
|
vm_state_colour = ansiprint.blue()
|
||||||
|
|
||||||
# Handle colouring for an invalid network config
|
# Handle colouring for an invalid network config
|
||||||
net_list = []
|
net_list = []
|
||||||
vm_nets_colour = ansiprint.end()
|
for net in domain_information['networks']:
|
||||||
for net in vm_nets[vm]:
|
# Split out just the numerical (VNI) part of the brXXXX name
|
||||||
net_exists = zkhandler.exists(zk_conn, '/networks/{}'.format(net))
|
net_vnis = re.findall(r'\d+', net['source'])
|
||||||
net_list.append(net)
|
if net_vnis:
|
||||||
if not net_exists and net != 'cluster':
|
net_vni = net_vnis[0]
|
||||||
vm_nets_colour = ansiprint.red()
|
else:
|
||||||
vm_nets[vm] = ','.join(net_list)
|
net_vni = re.sub('br', '', net['source'])
|
||||||
|
net_exists = zkhandler.exists(zk_conn, '/networks/{}'.format(net_vni))
|
||||||
|
if not net_exists and net_vni != 'cluster':
|
||||||
|
net_list.append(ansiprint.red() + net_vni + ansiprint.end())
|
||||||
|
else:
|
||||||
|
net_list.append(net_vni)
|
||||||
|
|
||||||
vm_list_output.append(
|
vm_list_output.append(
|
||||||
'{bold}{vm_name: <{vm_name_length}} {vm_uuid: <{vm_uuid_length}} \
|
'{bold}{vm_name: <{vm_name_length}} {vm_uuid: <{vm_uuid_length}} \
|
||||||
{vm_state_colour}{vm_state: <{vm_state_length}}{end_colour} \
|
{vm_state_colour}{vm_state: <{vm_state_length}}{end_colour} \
|
||||||
{vm_nets_colour}{vm_networks: <{vm_nets_length}}{end_colour} \
|
{vm_networks: <{vm_nets_length}} \
|
||||||
{vm_memory: <{vm_ram_length}} {vm_vcpu: <{vm_vcpu_length}} \
|
{vm_memory: <{vm_ram_length}} {vm_vcpu: <{vm_vcpu_length}} \
|
||||||
{vm_node: <{vm_node_length}} \
|
{vm_node: <{vm_node_length}} \
|
||||||
{vm_migrated: <{vm_migrated_length}}{end_bold}'.format(
|
{vm_migrated: <{vm_migrated_length}}{end_bold}'.format(
|
||||||
|
@ -764,19 +785,19 @@ def get_list(zk_conn, node, state, limit, raw):
|
||||||
bold='',
|
bold='',
|
||||||
end_bold='',
|
end_bold='',
|
||||||
vm_state_colour=vm_state_colour,
|
vm_state_colour=vm_state_colour,
|
||||||
vm_nets_colour=vm_nets_colour,
|
|
||||||
end_colour=ansiprint.end(),
|
end_colour=ansiprint.end(),
|
||||||
vm_name=vm_name[vm],
|
vm_name=domain_information['name'],
|
||||||
vm_uuid=vm_uuid[vm],
|
vm_uuid=domain_information['uuid'],
|
||||||
vm_state=vm_state[vm],
|
vm_state=domain_information['state'],
|
||||||
vm_networks=vm_nets[vm],
|
vm_networks=','.join(net_list),
|
||||||
vm_memory=vm_memory[vm],
|
vm_memory=domain_information['memory'],
|
||||||
vm_vcpu=vm_vcpu[vm],
|
vm_vcpu=domain_information['vcpu'],
|
||||||
vm_node=vm_node[vm],
|
vm_node=domain_information['node'],
|
||||||
vm_migrated=vm_migrated[vm]
|
vm_migrated=domain_information['migrated']
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
click.echo('\n'.join(sorted(vm_list_output)))
|
click.echo('\n'.join(sorted(vm_list_output)))
|
||||||
|
|
||||||
return True, ''
|
return True, ''
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue