From 1bfd8734307f3ab14df662f334d2663287a6824f Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 17 Nov 2011 18:21:28 +0100 Subject: [PATCH] feature #954: Update render of Template/Resource attributes --- src/cli/one_helper/onehost_helper.rb | 4 ++++ src/cli/one_helper/onevm_helper.rb | 2 +- src/cli/one_helper/onevnet_helper.rb | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/cli/one_helper/onehost_helper.rb b/src/cli/one_helper/onehost_helper.rb index 2a23aab046..eeaeaf613d 100644 --- a/src/cli/one_helper/onehost_helper.rb +++ b/src/cli/one_helper/onehost_helper.rb @@ -60,6 +60,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper puts str % ["IM_MAD", host['IM_MAD']] puts str % ["VM_MAD", host['VM_MAD']] puts str % ["TM_MAD", host['TM_MAD']] + puts str % ["LAST MONITORING TIME", host['LAST_MON_TIME']] puts CLIHelper.print_header(str_h1 % "HOST SHARES", false) @@ -70,6 +71,9 @@ class OneHostHelper < OpenNebulaHelper::OneHelper puts str % ["MAX CPU", host['HOST_SHARE/MAX_CPU']] puts str % ["USED CPU (REAL)", host['HOST_SHARE/USED_CPU']] puts str % ["USED CPU (ALLOCATED)", host['HOST_SHARE/CPU_USAGE']] + puts str % ["MAX DISK", host['HOST_SHARE/MAX_DISK']] + puts str % ["USED DISK (REAL)", host['HOST_SHARE/USED_DISK']] + puts str % ["USED DISK (ALLOCATED)", host['HOST_SHARE/DISK_USAGE']] puts str % ["RUNNING VMS", host['HOST_SHARE/RUNNING_VMS']] puts diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index 9ecc4425eb..ffeeec15ff 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -65,7 +65,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper def format_resource(vm) str_h1="%-80s" str="%-20s: %-20s" - + CLIHelper.print_header( str_h1 % "VIRTUAL MACHINE #{vm['ID']} INFORMATION") puts str % ["ID", vm.id.to_s] diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb index 07a4dab8e9..3d72e196af 100644 --- a/src/cli/one_helper/onevnet_helper.rb +++ b/src/cli/one_helper/onevnet_helper.rb @@ -53,9 +53,12 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper str="%-15s: %-20s" puts str % ["ID", vn.id.to_s] + puts str % ["NAME", vn['NAME']] puts str % ["USER", vn['UNAME']] puts str % ["GROUP", vn['GNAME']] puts str % ["PUBLIC", OpenNebulaHelper.boolean_to_str(vn['PUBLIC'])] + puts str % ["TYPE", vn.type_str] + puts str % ["BRIDGE", vn["BRIDGE"]] puts str % ["USED LEASES", vn['TOTAL_LEASES']] puts