From 846fe9619f13d55bc941efe9be260802a4ce2aa2 Mon Sep 17 00:00:00 2001
From: Alejandro Huertas Herrero <ahuertas@opennebula.systems>
Date: Mon, 13 Sep 2021 12:33:40 +0200
Subject: [PATCH] B #5475: remove XML option from flow cmds (#1448)

---
 src/cli/oneflow          | 9 ++++-----
 src/cli/oneflow-template | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/cli/oneflow b/src/cli/oneflow
index 89caa98663..e4f00d78e4 100755
--- a/src/cli/oneflow
+++ b/src/cli/oneflow
@@ -82,6 +82,8 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'Force flow necover delete'
     }
 
+    FORMAT = [OpenNebulaHelper::JSON, OpenNebulaHelper::YAML]
+
     # create helper object
     helper = OneFlowHelper.new
 
@@ -122,7 +124,7 @@ CommandParser::CmdParser.new(ARGV) do
         List the available services
     EOT
 
-    command :list, list_desc, :options => OpenNebulaHelper::FORMAT do
+    command :list, list_desc, :options => FORMAT do
         helper.list_service_pool(helper.client(options), options)
     end
 
@@ -146,10 +148,7 @@ CommandParser::CmdParser.new(ARGV) do
         Show detailed information of a given service
     EOT
 
-    command :show,
-            show_desc,
-            :service_id,
-            :options => OpenNebulaHelper::FORMAT do
+    command :show, show_desc, :service_id, :options => FORMAT do
         helper.format_resource(helper.client(options), args[0], options)
     end
 
diff --git a/src/cli/oneflow-template b/src/cli/oneflow-template
index 3aadaea1ee..d12069f746 100755
--- a/src/cli/oneflow-template
+++ b/src/cli/oneflow-template
@@ -104,6 +104,8 @@ CommandParser::CmdParser.new(ARGV) do
                         'deleting service template'
     }
 
+    FORMAT = [OpenNebulaHelper::JSON, OpenNebulaHelper::YAML]
+
     usage '`oneflow-template` <command> [<args>] [<options>]'
     version OpenNebulaHelper::ONE_VERSION
 
@@ -141,7 +143,7 @@ CommandParser::CmdParser.new(ARGV) do
         List the available Service Templates
     EOT
 
-    command :list, list_desc, :options => OpenNebulaHelper::FORMAT do
+    command :list, list_desc, :options => FORMAT do
         helper.list_service_template_pool(helper.client(options), options)
     end
 
@@ -169,10 +171,7 @@ CommandParser::CmdParser.new(ARGV) do
         Show detailed information of a given Service Template
     EOT
 
-    command :show,
-            show_desc,
-            :templateid,
-            :options => OpenNebulaHelper::FORMAT do
+    command :show, show_desc, :templateid, :options => FORMAT do
         helper.format_resource(helper.client(options), args[0], options)
     end