From e30d37204556464972a7d201c5167bcbddfbdbcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Thu, 6 Nov 2014 13:22:13 +0100 Subject: [PATCH] Feature #3264: Fix csv output for empty responses --- src/cli/oneacct | 6 +++++- src/cli/onevm | 18 ------------------ 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/cli/oneacct b/src/cli/oneacct index 25537a04b9..3369bd7828 100755 --- a/src/cli/oneacct +++ b/src/cli/oneacct @@ -213,7 +213,11 @@ cmd = CommandParser::CmdParser.new(ARGV) do end if options[:csv] - a = data_hash['SHOWBACK_RECORDS']['SHOWBACK'] + a = Array.new + + if data_hash['SHOWBACK_RECORDS'] + a = data_hash['SHOWBACK_RECORDS']['SHOWBACK'] + end AcctHelper::SHOWBACK_TABLE.show(a, options) exit(0) diff --git a/src/cli/onevm b/src/cli/onevm index 602cef799f..035d5535d2 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -834,24 +834,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do end end - showback_desc = <<-EOT.unindent - Development command to get raw showback data - EOT - - command :showback, showback_desc, [:filterflag, nil] do - - rc = OpenNebula::VirtualMachinePool.new(helper.client).showback_xml(args[0]) - - if OpenNebula.is_error?(rc) - warn rc.message - exit -1 - else - puts rc - exit 0 - end - - end - START_TIME = { :name => "start_time", :short => "-s TIME",