From 186e1d2e954a255a8485ff565d4db4888bac4efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Wed, 4 Jul 2012 16:19:47 +0200 Subject: [PATCH] Feature #1285: rearrange one* list column widths (cherry picked from commit 75b79c99c87798cf256f629f62f7e8730701fd7c) --- src/cli/etc/onecluster.yaml | 4 ++-- src/cli/etc/onedatastore.yaml | 9 ++++----- src/cli/etc/onegroup.yaml | 4 ++-- src/cli/etc/onehost.yaml | 21 +++++++++++---------- src/cli/etc/oneimage.yaml | 12 +++++++----- src/cli/etc/onetemplate.yaml | 8 ++++---- src/cli/etc/oneuser.yaml | 8 ++++---- src/cli/etc/onevm.yaml | 9 +++++---- src/cli/etc/onevnet.yaml | 13 +++++++------ src/cli/one_helper.rb | 8 ++++++-- src/cli/one_helper/onecluster_helper.rb | 10 +++++----- src/cli/one_helper/onedatastore_helper.rb | 12 ++++++------ src/cli/one_helper/onegroup_helper.rb | 4 ++-- src/cli/one_helper/onehost_helper.rb | 20 ++++++++++---------- src/cli/one_helper/oneimage_helper.rb | 20 ++++++++++---------- src/cli/one_helper/onetemplate_helper.rb | 8 ++++---- src/cli/one_helper/oneuser_helper.rb | 8 ++++---- src/cli/one_helper/onevm_helper.rb | 8 ++++---- src/cli/one_helper/onevnet_helper.rb | 12 ++++++------ 19 files changed, 103 insertions(+), 95 deletions(-) diff --git a/src/cli/etc/onecluster.yaml b/src/cli/etc/onecluster.yaml index 6b456c0d37..61ad5a4d87 100644 --- a/src/cli/etc/onecluster.yaml +++ b/src/cli/etc/onecluster.yaml @@ -1,11 +1,11 @@ --- :ID: :desc: ONE identifier for the Cluster - :size: 4 + :size: 5 :NAME: :desc: Name of the Cluster - :size: 15 + :size: 25 :left: true :HOSTS: diff --git a/src/cli/etc/onedatastore.yaml b/src/cli/etc/onedatastore.yaml index 7b9ffe5237..4a1e5b89f8 100644 --- a/src/cli/etc/onedatastore.yaml +++ b/src/cli/etc/onedatastore.yaml @@ -5,27 +5,26 @@ :NAME: :desc: Name of the Datastore - :size: 15 + :size: 25 :left: true :CLUSTER: :desc: Name of the Cluster - :size: 8 + :size: 15 :left: true :IMAGES: :desc: Number of Images :size: 6 - :left: true :TYPE: :desc: Datastore driver - :size: 6 + :size: 8 :left: true :TM: :desc: Transfer driver - :size: 6 + :size: 8 :left: true :default: diff --git a/src/cli/etc/onegroup.yaml b/src/cli/etc/onegroup.yaml index 662d3fe297..51b54d7042 100644 --- a/src/cli/etc/onegroup.yaml +++ b/src/cli/etc/onegroup.yaml @@ -5,12 +5,12 @@ :NAME: :desc: Name of the Group - :size: 15 + :size: 25 :left: true :VMS: :desc: Number of VMS - :size: 8 + :size: 6 :MEMORY: :desc: Total memory allocated to user VMs diff --git a/src/cli/etc/onehost.yaml b/src/cli/etc/onehost.yaml index 3db2b091ff..8033fa67e9 100644 --- a/src/cli/etc/onehost.yaml +++ b/src/cli/etc/onehost.yaml @@ -5,45 +5,46 @@ :NAME: :desc: Name of the Host - :size: 12 + :size: 15 :left: true :CLUSTER: :desc: Name of the Cluster - :size: 8 + :size: 9 :left: true :RVM: :desc: Number of Virtual Machines running - :size: 6 + :size: 3 :TCPU: :desc: Total CPU percentage - :size: 6 + :size: 4 :FCPU: :desc: Free CPU percentage - :size: 6 + :size: 4 :ACPU: :desc: Available cpu percentage (not reserved by VMs) - :size: 6 + :size: 4 :TMEM: :desc: Total Memory - :size: 6 + :size: 7 :FMEM: :desc: Free Memory - :size: 6 + :size: 7 :AMEM: :desc: Available Memory (not reserved by VMs) - :size: 6 + :size: 7 :STAT: :desc: Host status - :size: 7 + :size: 6 + :left: true :default: - :ID diff --git a/src/cli/etc/oneimage.yaml b/src/cli/etc/oneimage.yaml index 235d7e8ca9..6469a5a9a9 100644 --- a/src/cli/etc/oneimage.yaml +++ b/src/cli/etc/oneimage.yaml @@ -5,17 +5,17 @@ :USER: :desc: Username of the Virtual Machine owner - :size: 8 + :size: 10 :left: true :GROUP: :desc: Group of the Virtual Machine - :size: 8 + :size: 10 :left: true :NAME: :desc: Name of the Image - :size: 12 + :size: 15 :left: true :DATASTORE: @@ -30,10 +30,11 @@ :TYPE: :desc: Type of the Image :size: 4 + :left: true :REGTIME: :desc: Registration time of the Image - :size: 16 + :size: 15 :PERSISTENT: :desc: Whether the Image is persistent or not @@ -42,10 +43,11 @@ :STAT: :desc: State of the Image :size: 4 + :left: true :RVMS: :desc: Number of VMs currently running from this Image - :size: 5 + :size: 4 :default: - :ID diff --git a/src/cli/etc/onetemplate.yaml b/src/cli/etc/onetemplate.yaml index 809930f235..42aefbcc45 100644 --- a/src/cli/etc/onetemplate.yaml +++ b/src/cli/etc/onetemplate.yaml @@ -5,22 +5,22 @@ :NAME: :desc: Name of the Template - :size: 15 + :size: 27 :left: true :USER: :desc: Username of the Template owner - :size: 8 + :size: 15 :left: true :GROUP: :desc: Group of the Template - :size: 8 + :size: 15 :left: true :REGTIME: :desc: Registration time of the Template - :size: 20 + :size: 15 :default: - :ID diff --git a/src/cli/etc/oneuser.yaml b/src/cli/etc/oneuser.yaml index 35be58f130..c6b554681a 100644 --- a/src/cli/etc/oneuser.yaml +++ b/src/cli/etc/oneuser.yaml @@ -5,22 +5,22 @@ :NAME: :desc: Name of the User - :size: 15 + :size: 18 :left: true :GROUP: :desc: Group of the User - :size: 8 + :size: 15 :left: true :AUTH: :desc: Auth driver of the User - :size: 8 + :size: 15 :left: true :VMS: :desc: Number of VMS - :size: 8 + :size: 6 :MEMORY: :desc: Total memory allocated to user VMs diff --git a/src/cli/etc/onevm.yaml b/src/cli/etc/onevm.yaml index 41f3e62b73..bcc26c199f 100644 --- a/src/cli/etc/onevm.yaml +++ b/src/cli/etc/onevm.yaml @@ -5,7 +5,7 @@ :NAME: :desc: Name of the Virtual Machine - :size: 12 + :size: 15 :left: true :USER: @@ -24,7 +24,7 @@ :UCPU: :desc: CPU percentage used by the VM - :size: 3 + :size: 4 :UMEM: :desc: Memory used by the VM @@ -32,11 +32,12 @@ :HOST: :desc: Host where the VM is running - :size: 15 + :size: 10 + :left: true :TIME: :desc: Time since the VM was submitted - :size: 11 + :size: 10 :default: - :ID diff --git a/src/cli/etc/onevnet.yaml b/src/cli/etc/onevnet.yaml index 36d07930ca..7b46021ac5 100644 --- a/src/cli/etc/onevnet.yaml +++ b/src/cli/etc/onevnet.yaml @@ -5,12 +5,12 @@ :USER: :desc: Username of the Virtual Network owner - :size: 8 + :size: 12 :left: true :GROUP: :desc: Group of the Virtual Network - :size: 8 + :size: 12 :left: true :NAME: @@ -20,7 +20,7 @@ :CLUSTER: :desc: Name of the Cluster - :size: 8 + :size: 10 :left: true :TYPE: @@ -29,15 +29,16 @@ :SIZE: :desc: Size of the Virtual Network - :size: 6 + :size: 5 :BRIDGE: :desc: Bridge associated to the Virtual Network - :size: 6 + :size: 8 + :left: true :LEASES: :desc: Number of this Virtual Networks given leases - :size: 7 + :size: 6 :default: - :ID diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index e1b1495602..8123be6903 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -369,13 +369,17 @@ EOT end end - def OpenNebulaHelper.period_to_str(time) + def OpenNebulaHelper.period_to_str(time, print_seconds=true) seconds=time.to_i minutes, seconds=seconds.divmod(60) hours, minutes=minutes.divmod(60) days, hours=hours.divmod(24) - "%4dd %02d:%02d:%02d" % [days, hours, minutes, seconds] + if print_seconds + "%3dd %02d:%02d:%02d" % [days, hours, minutes, seconds] + else + "%3dd %02d:%02d" % [days, hours, minutes] + end end BinarySufix = ["K", "M", "G", "T" ] diff --git a/src/cli/one_helper/onecluster_helper.rb b/src/cli/one_helper/onecluster_helper.rb index 41028cb90a..d427c4a8f5 100644 --- a/src/cli/one_helper/onecluster_helper.rb +++ b/src/cli/one_helper/onecluster_helper.rb @@ -49,23 +49,23 @@ class OneClusterHelper < OpenNebulaHelper::OneHelper config_file = self.class.table_conf table = CLIHelper::ShowTable.new(config_file, self) do - column :ID, "ONE identifier for the Cluster", :size=>4 do |d| + column :ID, "ONE identifier for the Cluster", :size=>5 do |d| d["ID"] end - column :NAME, "Name of the Cluster", :left, :size=>15 do |d| + column :NAME, "Name of the Cluster", :left, :size=>25 do |d| d["NAME"] end - column :HOSTS, "Number of Hosts", :left, :size=>5 do |d| + column :HOSTS, "Number of Hosts", :size=>5 do |d| d["HOSTS"]["ID"] ? d["HOSTS"]["ID"].size : 0 end - column :VNETS, "Number of Networks", :left, :size=>5 do |d| + column :VNETS, "Number of Networks", :size=>5 do |d| d["VNETS"]["ID"] ? d["VNETS"]["ID"].size : 0 end - column :DATASTORES, "Number of Datastores", :left, :size=>10 do |d| + column :DATASTORES, "Number of Datastores", :size=>10 do |d| d["DATASTORES"]["ID"] ? d["DATASTORES"]["ID"].size : 0 end diff --git a/src/cli/one_helper/onedatastore_helper.rb b/src/cli/one_helper/onedatastore_helper.rb index 1e53e9bbc7..3ec15e30f7 100644 --- a/src/cli/one_helper/onedatastore_helper.rb +++ b/src/cli/one_helper/onedatastore_helper.rb @@ -52,15 +52,15 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper d["ID"] end - column :NAME, "Name of the Datastore", :left, :size=>12 do |d| + column :NAME, "Name of the Datastore", :left, :size=>25 do |d| d["NAME"] end - column :CLUSTER, "Name of the Cluster", :left, :size=>8 do |d| + column :CLUSTER, "Name of the Cluster", :left, :size=>15 do |d| OpenNebulaHelper.cluster_str(d["CLUSTER"]) end - column :IMAGES, "Number of Images", :left, :size=>6 do |d| + column :IMAGES, "Number of Images", :size=>6 do |d| if d["IMAGES"]["ID"].nil? "0" else @@ -68,15 +68,15 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper end end - column :TYPE, "Datastore driver", :left, :size=>6 do |d| + column :TYPE, "Datastore driver", :left, :size=>8 do |d| d["DS_MAD"] end - column :TM, "Transfer driver", :left, :size=>6 do |d| + column :TM, "Transfer driver", :left, :size=>8 do |d| d["TM_MAD"] end - default :ID, :CLUSTER, :NAME, :IMAGES, :TYPE, :TM + default :ID, :NAME, :CLUSTER, :IMAGES, :TYPE, :TM end table diff --git a/src/cli/one_helper/onegroup_helper.rb b/src/cli/one_helper/onegroup_helper.rb index e377466c4c..b2185d00cc 100644 --- a/src/cli/one_helper/onegroup_helper.rb +++ b/src/cli/one_helper/onegroup_helper.rb @@ -53,11 +53,11 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper d["ID"] end - column :NAME, "Name of the Group", :left, :size=>15 do |d| + column :NAME, "Name of the Group", :left, :size=>25 do |d| d["NAME"] end - column :VMS, "Total number of VMS", :size=>8 do |d| + column :VMS, "Total number of VMS", :size=>6 do |d| if d.has_key?('VM_QUOTA') and d['VM_QUOTA'].has_key?('VM') d['VM_QUOTA']['VM']['VMS_USED'] else diff --git a/src/cli/one_helper/onehost_helper.rb b/src/cli/one_helper/onehost_helper.rb index f34a84ff0d..afb19eeafc 100644 --- a/src/cli/one_helper/onehost_helper.rb +++ b/src/cli/one_helper/onehost_helper.rb @@ -40,54 +40,54 @@ class OneHostHelper < OpenNebulaHelper::OneHelper d["ID"] end - column :NAME, "Name of the Host", :left, :size=>12 do |d| + column :NAME, "Name of the Host", :left, :size=>15 do |d| d["NAME"] end - column :CLUSTER, "Name of the Cluster", :left, :size=>8 do |d| + column :CLUSTER, "Name of the Cluster", :left, :size=>9 do |d| OpenNebulaHelper.cluster_str(d["CLUSTER"]) end - column :RVM, "Number of Virtual Machines running", :size=>6 do |d| + column :RVM, "Number of Virtual Machines running", :size=>3 do |d| d["HOST_SHARE"]["RUNNING_VMS"] end - column :TCPU, "Total CPU percentage", :size=>6 do |d| + column :TCPU, "Total CPU percentage", :size=>4 do |d| d["HOST_SHARE"]["MAX_CPU"] end - column :FCPU, "Free CPU percentage", :size=>6 do |d| + column :FCPU, "Free CPU percentage", :size=>4 do |d| d["HOST_SHARE"]["MAX_CPU"].to_i- d["HOST_SHARE"]["USED_CPU"].to_i end column :ACPU, "Available cpu percentage (not reserved by VMs)", - :size=>6 do |d| + :size=>4 do |d| max_cpu=d["HOST_SHARE"]["MAX_CPU"].to_i max_cpu=100 if max_cpu==0 max_cpu-d["HOST_SHARE"]["CPU_USAGE"].to_i end - column :TMEM, "Total Memory", :size=>6 do |d| + column :TMEM, "Total Memory", :size=>7 do |d| OpenNebulaHelper.unit_to_str( d["HOST_SHARE"]["MAX_MEM"].to_i, options) end - column :FMEM, "Free Memory", :size=>6 do |d| + column :FMEM, "Free Memory", :size=>7 do |d| OpenNebulaHelper.unit_to_str( d["HOST_SHARE"]["FREE_MEM"].to_i, options) end column :AMEM, "Available Memory (not reserved by VMs)", - :size=>6 do |d| + :size=>7 do |d| acpu=d["HOST_SHARE"]["MAX_MEM"].to_i- d["HOST_SHARE"]["MEM_USAGE"].to_i OpenNebulaHelper.unit_to_str(acpu,options) end - column :STAT, "Host status", :size=>7 do |d| + column :STAT, "Host status", :left, :size=>6 do |d| OneHostHelper.state_to_str(d["STATE"]) end diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb index e73866f1a3..5eb624461a 100644 --- a/src/cli/one_helper/oneimage_helper.rb +++ b/src/cli/one_helper/oneimage_helper.rb @@ -45,30 +45,30 @@ class OneImageHelper < OpenNebulaHelper::OneHelper d["ID"] end - column :USER, "Username of the Virtual Machine owner", :left, - :size=>8 do |d| + column :USER, "Username of the Image owner", :left, + :size=>10 do |d| helper.user_name(d, options) end - column :GROUP, "Group of the Virtual Machine", :left, - :size=>8 do |d| + column :GROUP, "Group of the Image", :left, + :size=>10 do |d| helper.group_name(d, options) end - column :NAME, "Name of the Image", :left, :size=>12 do |d| + column :NAME, "Name of the Image", :left, :size=>15 do |d| d["NAME"] end - column :DATASTORE, "Name of the Image", :left, :size=>10 do |d| + column :DATASTORE, "Name of the Datastore", :left, :size=>10 do |d| d["DATASTORE"] end - column :TYPE, "Type of the Image", :size=>4 do |d,e| + column :TYPE, "Type of the Image", :left, :size=>4 do |d,e| OneImageHelper.type_to_str(d["TYPE"]) end column :REGTIME, "Registration time of the Image", - :size=>20 do |d| + :size=>15 do |d| OpenNebulaHelper.time_to_str(d["REGTIME"]) end @@ -77,12 +77,12 @@ class OneImageHelper < OpenNebulaHelper::OneHelper OpenNebulaHelper.boolean_to_str(d["PERSISTENT"]) end - column :STAT, "State of the Image", :size=>4 do |d| + column :STAT, "State of the Image", :left, :size=>4 do |d| OneImageHelper.state_to_str(d["STATE"]) end column :RVMS, "Number of VMs currently running from this Image", - :size=>5 do |d| + :size=>4 do |d| d['RUNNING_VMS'] end diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb index 308d3a9193..a0470f0242 100644 --- a/src/cli/one_helper/onetemplate_helper.rb +++ b/src/cli/one_helper/onetemplate_helper.rb @@ -53,21 +53,21 @@ EOT d["ID"] end - column :NAME, "Name of the Template", :left, :size=>15 do |d| + column :NAME, "Name of the Template", :left, :size=>27 do |d| d["NAME"] end column :USER, "Username of the Template owner", :left, - :size=>8 do |d| + :size=>15 do |d| helper.user_name(d, options) end - column :GROUP, "Group of the Template", :left, :size=>8 do |d| + column :GROUP, "Group of the Template", :left, :size=>15 do |d| helper.group_name(d, options) end column :REGTIME, "Registration time of the Template", - :size=>20 do |d| + :size=>15 do |d| OpenNebulaHelper.time_to_str(d["REGTIME"]) end diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb index 8a21d5b300..6a8f2aed29 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -152,19 +152,19 @@ class OneUserHelper < OpenNebulaHelper::OneHelper d["ID"] end - column :NAME, "Name of the User", :left, :size=>15 do |d| + column :NAME, "Name of the User", :left, :size=>18 do |d| d["NAME"] end - column :GROUP, "Group of the User", :left, :size=>8 do |d| + column :GROUP, "Group of the User", :left, :size=>15 do |d| helper.group_name(d, options) end - column :AUTH, "Auth driver of the User", :left, :size=>8 do |d| + column :AUTH, "Auth driver of the User", :left, :size=>15 do |d| d["AUTH_DRIVER"] end - column :VMS, "Number of VMS", :size=>8 do |d| + column :VMS, "Number of VMS", :size=>6 do |d| if d.has_key?('VM_QUOTA') and d['VM_QUOTA'].has_key?('VM') d['VM_QUOTA']['VM']['VMS_USED'] else diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index bee5cb3807..0612587f80 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -111,7 +111,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper OneVMHelper.state_to_str(d["STATE"], d["LCM_STATE"]) end - column :UCPU, "CPU percentage used by the VM", :size=>3 do |d| + column :UCPU, "CPU percentage used by the VM", :size=>4 do |d| d["CPU"] end @@ -119,7 +119,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper OpenNebulaHelper.unit_to_str(d["MEMORY"].to_i, options) end - column :HOST, "Host where the VM is running", :size=>15 do |d| + column :HOST, "Host where the VM is running", :left, :size=>10 do |d| if d['HISTORY_RECORDS'] && d['HISTORY_RECORDS']['HISTORY'] state_str = VirtualMachine::VM_STATE[d['STATE'].to_i] if %w{ACTIVE SUSPENDED}.include? state_str @@ -128,11 +128,11 @@ class OneVMHelper < OpenNebulaHelper::OneHelper end end - column :TIME, "Time since the VM was submitted", :size=>11 do |d| + column :TIME, "Time since the VM was submitted", :size=>10 do |d| stime = d["STIME"].to_i etime = d["ETIME"]=="0" ? Time.now.to_i : d["ETIME"].to_i dtime = etime-stime - OpenNebulaHelper.period_to_str(dtime) + OpenNebulaHelper.period_to_str(dtime, false) end default :ID, :USER, :GROUP, :NAME, :STAT, :UCPU, :UMEM, :HOST, diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb index 39907836b1..90902d28cc 100644 --- a/src/cli/one_helper/onevnet_helper.rb +++ b/src/cli/one_helper/onevnet_helper.rb @@ -40,12 +40,12 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper end column :USER, "Username of the Virtual Network owner", :left, - :size=>8 do |d| + :size=>12 do |d| helper.user_name(d, options) end column :GROUP, "Group of the Virtual Network", :left, - :size=>8 do |d| + :size=>12 do |d| helper.group_name(d, options) end @@ -54,7 +54,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper d["NAME"] end - column :CLUSTER, "Name of the Cluster", :left, :size=>8 do |d| + column :CLUSTER, "Name of the Cluster", :left, :size=>10 do |d| OpenNebulaHelper.cluster_str(d["CLUSTER"]) end @@ -66,8 +66,8 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper d["SIZE"] end - column :BRIDGE, "Bridge associated to the Virtual Network", - :size=>6 do |d| + column :BRIDGE, "Bridge associated to the Virtual Network", :left, + :size=>8 do |d| d["BRIDGE"] end @@ -76,7 +76,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper d["TOTAL_LEASES"] end - default :ID, :USER, :GROUP, :NAME, :TYPE, :BRIDGE, :LEASES + default :ID, :USER, :GROUP, :NAME, :CLUSTER, :TYPE, :BRIDGE, :LEASES end table