parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Add provision state for VMs

This commit is contained in:
Joshua Boniface 2020-01-08 17:40:02 -05:00
parent 9cab1c6eb5
commit c515d63340
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client-cli/cli_lib/cluster.py
View File

@ -129,7 +129,7 @@ def format_info(cluster_information, oformat):
if state == 'total' or state == 'start': if state == 'total' or state == 'start':
continue continue
if state in ['disable', 'migrate', 'unmigrate']: if state in ['disable', 'migrate', 'unmigrate', 'provision']:
colour = ansiprint.blue() colour = ansiprint.blue()
else: else:
colour = ansiprint.yellow() colour = ansiprint.yellow()

3
client-cli/cli_lib/vm.py
View File

@ -437,7 +437,8 @@ def format_info(config, domain_information, long_output):
'disable': ansiprint.blue(), 'disable': ansiprint.blue(),
'fail': ansiprint.red(), 'fail': ansiprint.red(),
'migrate': ansiprint.blue(), 'migrate': ansiprint.blue(),
'unmigrate': ansiprint.blue() 'unmigrate': ansiprint.blue(),
'provision': ansiprint.blue()
} }
ainformation.append('{}State:{} {}{}{}'.format(ansiprint.purple(), ansiprint.end(), dstate_colour[domain_information['state']], domain_information['state'], ansiprint.end())) 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('{}Current Node:{} {}'.format(ansiprint.purple(), ansiprint.end(), domain_information['node']))

4
client-common/cluster.py
View File

@ -73,7 +73,7 @@ def getClusterInformation(zk_conn):
vm_report_status = list(range(0, vm_count)) vm_report_status = list(range(0, vm_count))
for index, vm in enumerate(vm_list): for index, vm in enumerate(vm_list):
vm_state = vm['state'] vm_state = vm['state']
if vm_state not in ['start', 'disable', 'migrate', 'unmigrate']: if vm_state not in ['start', 'disable', 'migrate', 'unmigrate', 'provision']:
vm_healthy_status[index] = False vm_healthy_status[index] = False
else: else:
vm_healthy_status[index] = True vm_healthy_status[index] = True
@ -114,7 +114,7 @@ def getClusterInformation(zk_conn):
'stop,ready', 'stop,flush', 'stop,flushed', 'stop,unflush' 'stop,ready', 'stop,flush', 'stop,flushed', 'stop,unflush'
] ]
vm_state_combinations = [ vm_state_combinations = [
'start', 'restart', 'shutdown', 'stop', 'disable', 'fail', 'migrate', 'unmigrate' 'start', 'restart', 'shutdown', 'stop', 'disable', 'fail', 'migrate', 'unmigrate', 'provision'
] ]
ceph_osd_state_combinations = [ ceph_osd_state_combinations = [
'up,in', 'up,out', 'down,in', 'down,out' 'up,in', 'up,out', 'down,in', 'down,out'

3
node-daemon/pvcd/VMInstance.py
View File

@ -487,6 +487,9 @@ class VMInstance(object):
# restart # restart
# shutdown # shutdown
# stop # stop
# States we don't (need to) handle are:
# disable
# provision
# Conditional pass one - Are we already performing an action # Conditional pass one - Are we already performing an action
if self.instart == False \ if self.instart == False \