From 8a58141fb13f2090c62a0139d72a853bb3d64ec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 25 Oct 2013 12:29:02 +0200 Subject: [PATCH] Feature #1678: Do not show local system DS monitoring information in onedatastore output --- src/cli/one_helper/onedatastore_helper.rb | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/cli/one_helper/onedatastore_helper.rb b/src/cli/one_helper/onedatastore_helper.rb index dd7d898da4..f8596e699f 100644 --- a/src/cli/one_helper/onedatastore_helper.rb +++ b/src/cli/one_helper/onedatastore_helper.rb @@ -49,7 +49,12 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper end column :SIZE, "Datastore total size", :size =>10 do |d| - OpenNebulaHelper.unit_to_str(d['TOTAL_MB'].to_i, {}, 'M') + shared = d['TEMPLATE']['SHARED'] + if shared != nil && shared.upcase == 'NO' + "-" + else + OpenNebulaHelper.unit_to_str(d['TOTAL_MB'].to_i, {}, 'M') + end end column :AVAIL, "Datastore free size", :left, :size =>5 do |d| @@ -126,9 +131,13 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper puts CLIHelper.print_header(str_h1 % "DATASTORE CAPACITY", false) - puts str % ["TOTAL:", OpenNebulaHelper.unit_to_str(datastore['TOTAL_MB'].to_i, {},'M')] - puts str % ["USED: ", OpenNebulaHelper.unit_to_str(datastore['USED_MB'].to_i, {},'M')] - puts str % ["FREE:", OpenNebulaHelper.unit_to_str(datastore['FREE_MB'].to_i, {},'M')] + + shared = datastore['TEMPLATE/SHARED'] + local = shared != nil && shared.upcase == 'NO' + + puts str % ["TOTAL:", local ? '-' : OpenNebulaHelper.unit_to_str(datastore['TOTAL_MB'].to_i, {},'M')] + puts str % ["USED: ", local ? '-' : OpenNebulaHelper.unit_to_str(datastore['USED_MB'].to_i, {},'M')] + puts str % ["FREE:", local ? '-' : OpenNebulaHelper.unit_to_str(datastore['FREE_MB'].to_i, {},'M')] puts CLIHelper.print_header(str_h1 % "PERMISSIONS",false)