From 7366c2d2d3e2f5e611ebd8addc218c1b803e41dc Mon Sep 17 00:00:00 2001 From: Alejandro Huertas Herrero Date: Mon, 19 Oct 2020 10:05:30 +0200 Subject: [PATCH] M #-: fix minor bug in JSON CLI output (#326) --- src/cli/one_helper/onetemplate_helper.rb | 11 +++++++++++ src/cli/one_helper/onevrouter_helper.rb | 19 ------------------- src/cli/one_helper/onezone_helper.rb | 11 +++++++++++ 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb index 01132070d3..670e0bad51 100644 --- a/src/cli/one_helper/onetemplate_helper.rb +++ b/src/cli/one_helper/onetemplate_helper.rb @@ -87,6 +87,17 @@ EOT if options[:xml] return 0, resource.to_xml(true) + elsif options[:json] + # If body is set, the resource contains a JSON inside + if options[:body] + return 0, check_resource_xsd(resource) + else + return 0, ::JSON.pretty_generate( + check_resource_xsd(resource) + ) + end + elsif options[:yaml] + return 0, check_resource_xsd(resource).to_yaml(:indent => 4) else format_resource(resource, options) return 0 diff --git a/src/cli/one_helper/onevrouter_helper.rb b/src/cli/one_helper/onevrouter_helper.rb index e96b8f5e95..d5e6ef7a29 100644 --- a/src/cli/one_helper/onevrouter_helper.rb +++ b/src/cli/one_helper/onevrouter_helper.rb @@ -38,25 +38,6 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper "onevrouter.yaml" end - def show_resource(id, options) - resource = retrieve_resource(id) - - if !options[:extended].nil? - rc = resource.info(options[:extended]) - else - rc = resource.info - end - - return -1, rc.message if OpenNebula.is_error?(rc) - - if options[:xml] - return 0, resource.to_xml(true) - else - format_resource(resource, options) - return 0 - end - end - def format_pool(options) config_file = self.class.table_conf diff --git a/src/cli/one_helper/onezone_helper.rb b/src/cli/one_helper/onezone_helper.rb index 68a4229e1f..cf530e0382 100644 --- a/src/cli/one_helper/onezone_helper.rb +++ b/src/cli/one_helper/onezone_helper.rb @@ -470,6 +470,17 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper if options[:xml] return 0, resource.to_xml(true) + elsif options[:json] + # If body is set, the resource contains a JSON inside + if options[:body] + return 0, check_resource_xsd(resource) + else + return 0, ::JSON.pretty_generate( + check_resource_xsd(resource) + ) + end + elsif options[:yaml] + return 0, check_resource_xsd(resource).to_yaml(:indent => 4) else format_resource(resource, options) return 0