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

Tweak some output formatting in lists

Browse Source
This commit is contained in:
Joshua Boniface
2018-11-01 23:24:38 -04:00
parent a2f4102cb5
commit 2c2208ab07
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client-common/ceph.py
View File

@@ -487,13 +487,13 @@ def formatPoolList(zk_conn, pool_list):
{pool_id: <{pool_id_length}} \ {pool_id: <{pool_id_length}} \
{pool_name: <{pool_name_length}} \ {pool_name: <{pool_name_length}} \
{pool_size: <{pool_size_length}} \ {pool_size: <{pool_size_length}} \
Objects: {pool_objects: <{pool_objects_length}} \ Obj: {pool_objects: <{pool_objects_length}} \
{pool_clones: <{pool_clones_length}} \ {pool_clones: <{pool_clones_length}} \
{pool_copies: <{pool_copies_length}} \ {pool_copies: <{pool_copies_length}} \
{pool_degraded: <{pool_degraded_length}} \ {pool_degraded: <{pool_degraded_length}} \
Read: {pool_read_ops: <{pool_read_ops_length}} \ Rd: {pool_read_ops: <{pool_read_ops_length}} \
{pool_read_data: <{pool_read_data_length}} \ {pool_read_data: <{pool_read_data_length}} \
Write: {pool_write_ops: <{pool_write_ops_length}} \ Wr: {pool_write_ops: <{pool_write_ops_length}} \
{pool_write_data: <{pool_write_data_length}} \ {pool_write_data: <{pool_write_data_length}} \
{end_bold}'.format( {end_bold}'.format(
bold=ansiprint.bold(), bold=ansiprint.bold(),

8
client-common/node.py
View File

@@ -286,9 +286,9 @@ def get_list(zk_conn, limit):
# Format the string (header) # Format the string (header)
node_list_output.append( node_list_output.append(
'{bold}{node_name: <{node_name_length}} \ '{bold}{node_name: <{node_name_length}} \
State: {daemon_state_colour}{node_daemon_state: <{daemon_state_length}}{end_colour} {router_state_colour}{node_router_state: <{router_state_length}}{end_colour} {domain_state_colour}{node_domain_state: <{domain_state_length}}{end_colour} \ St: {daemon_state_colour}{node_daemon_state: <{daemon_state_length}}{end_colour} {router_state_colour}{node_router_state: <{router_state_length}}{end_colour} {domain_state_colour}{node_domain_state: <{domain_state_length}}{end_colour} \
Resources: {node_domains_count: <4} {node_cpu_count: <5} {node_load: <6} \ Res: {node_domains_count: <4} {node_cpu_count: <5} {node_load: <5} \
RAM (MiB): {node_mem_total: <6} {node_mem_used: <6} {node_mem_free: <6} {node_mem_allocated: <6}{end_bold}'.format( Mem (M): {node_mem_total: <6} {node_mem_used: <6} {node_mem_free: <6} {node_mem_allocated: <6}{end_bold}'.format(
node_name_length=node_name_length, node_name_length=node_name_length,
daemon_state_length=daemon_state_length, daemon_state_length=daemon_state_length,
router_state_length=router_state_length, router_state_length=router_state_length,
@@ -344,7 +344,7 @@ RAM (MiB): {node_mem_total: <6} {node_mem_used: <6} {node_mem_free: <6} {node_me
node_list_output.append( node_list_output.append(
'{bold}{node_name: <{node_name_length}} \ '{bold}{node_name: <{node_name_length}} \
{daemon_state_colour}{node_daemon_state: <{daemon_state_length}}{end_colour} {router_state_colour}{node_router_state: <{router_state_length}}{end_colour} {domain_state_colour}{node_domain_state: <{domain_state_length}}{end_colour} \ {daemon_state_colour}{node_daemon_state: <{daemon_state_length}}{end_colour} {router_state_colour}{node_router_state: <{router_state_length}}{end_colour} {domain_state_colour}{node_domain_state: <{domain_state_length}}{end_colour} \
{node_domains_count: <4} {node_cpu_count: <5} {node_load: <6} \ {node_domains_count: <4} {node_cpu_count: <5} {node_load: <5} \
{node_mem_total: <6} {node_mem_used: <6} {node_mem_free: <6} {node_mem_allocated: <6}{end_bold}'.format( {node_mem_total: <6} {node_mem_used: <6} {node_mem_free: <6} {node_mem_allocated: <6}{end_bold}'.format(
node_name_length=node_name_length, node_name_length=node_name_length,
daemon_state_length=daemon_state_length, daemon_state_length=daemon_state_length,

10
client-common/vm.py
View File

@@ -70,7 +70,7 @@ def getInformationFromXML(zk_conn, uuid, long_output):
ainformation.append('{}UUID:{} {}'.format(ansiprint.purple(), ansiprint.end(), duuid)) ainformation.append('{}UUID:{} {}'.format(ansiprint.purple(), ansiprint.end(), duuid))
ainformation.append('{}Name:{} {}'.format(ansiprint.purple(), ansiprint.end(), dname)) ainformation.append('{}Name:{} {}'.format(ansiprint.purple(), ansiprint.end(), dname))
ainformation.append('{}Description:{} {}'.format(ansiprint.purple(), ansiprint.end(), ddescription)) ainformation.append('{}Description:{} {}'.format(ansiprint.purple(), ansiprint.end(), ddescription))
ainformation.append('{}Memory (MiB):{} {}'.format(ansiprint.purple(), ansiprint.end(), dmemory)) ainformation.append('{}Memory (M):{} {}'.format(ansiprint.purple(), ansiprint.end(), dmemory))
ainformation.append('{}vCPUs:{} {}'.format(ansiprint.purple(), ansiprint.end(), dvcpu)) ainformation.append('{}vCPUs:{} {}'.format(ansiprint.purple(), ansiprint.end(), dvcpu))
ainformation.append('{}Topology (S/C/T):{} {}'.format(ansiprint.purple(), ansiprint.end(), dvcputopo)) ainformation.append('{}Topology (S/C/T):{} {}'.format(ansiprint.purple(), ansiprint.end(), dvcputopo))
@@ -560,7 +560,7 @@ def get_list(zk_conn, node, limit):
# Determine optimal column widths # Determine optimal column widths
# Dynamic columns: node_name, node, migrated # Dynamic columns: node_name, node, migrated
vm_name_length = 10 vm_name_length = 5
vm_node_length = 8 vm_node_length = 8
vm_nets_length = 9 vm_nets_length = 9
vm_migrated_length = 10 vm_migrated_length = 10
@@ -588,7 +588,7 @@ def get_list(zk_conn, node, limit):
'{bold}{vm_name: <{vm_name_length}} {vm_uuid: <37} \ '{bold}{vm_name: <{vm_name_length}} {vm_uuid: <37} \
{vm_state_colour}{vm_state: <8}{end_colour} \ {vm_state_colour}{vm_state: <8}{end_colour} \
{vm_networks: <{vm_nets_length}} \ {vm_networks: <{vm_nets_length}} \
{vm_memory: <10} {vm_vcpu: <6} \ {vm_memory: <8} {vm_vcpu: <6} \
{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(
vm_name_length=vm_name_length, vm_name_length=vm_name_length,
@@ -603,7 +603,7 @@ def get_list(zk_conn, node, limit):
vm_uuid='UUID', vm_uuid='UUID',
vm_state='State', vm_state='State',
vm_networks='Networks', vm_networks='Networks',
vm_memory='RAM (MiB)', vm_memory='RAM (M)',
vm_vcpu='vCPUs', vm_vcpu='vCPUs',
vm_node='Node', vm_node='Node',
vm_migrated='Migrated' vm_migrated='Migrated'
@@ -639,7 +639,7 @@ def get_list(zk_conn, node, limit):
'{bold}{vm_name: <{vm_name_length}} {vm_uuid: <37} \ '{bold}{vm_name: <{vm_name_length}} {vm_uuid: <37} \
{vm_state_colour}{vm_state: <8}{end_colour} \ {vm_state_colour}{vm_state: <8}{end_colour} \
{vm_nets_colour}{vm_networks: <{vm_nets_length}}{end_colour} \ {vm_nets_colour}{vm_networks: <{vm_nets_length}}{end_colour} \
{vm_memory: <10} {vm_vcpu: <6} \ {vm_memory: <8} {vm_vcpu: <6} \
{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(
vm_name_length=vm_name_length, vm_name_length=vm_name_length,