F OpenNebula/one#6365: Improve oneflow listing commands CLI (#2870)

share/shell/bash_completion

@@ -33,27 +33,17 @@ _complete() {
 }
 
 _one_list() {
-    cmd=$1
     if [ -z "$2" ]; then
-        column="$COL_NAME"
+        col="$COL_NAME"
     else
-        column=$2
+        col=$2
     fi
-    filter=$3
 
-    case "$cmd" in
+    if [ -n "$3" ]; then
-        oneflow|oneflow-server|oneflow-template)
+        $1 list --no-header --csv -f "$3" -l "$col"
-            # everything under 4th column, NAME by default
+    else
-            $cmd list | awk 'NR > 1 {print $4}' # TODO: Implement --csv option for oneflow CLI
+        $1 list --no-header --csv -l "$col"
-            ;;
+    fi
-        *)
-            if [ -n "$filter" ]; then
-                $cmd list --no-header --csv -f "$filter" -l "$column"
-            else
-                $cmd list --no-header --csv -l "$column"
-            fi
-            ;;
-    esac
 }
 
 _one_simple() {

src/cli/one_helper.rb

@@ -593,7 +593,7 @@ Bash symbols must be escaped on STDIN passing'
 
     OPTIONS = FORMAT, EXTENDED, NUMERIC, KILOBYTES
 
-    BACKUP_MODES = %w[FULL INCREMENT]
+    BACKUP_MODES = ['FULL', 'INCREMENT']
 
     class OneHelper
 
@@ -2323,7 +2323,7 @@ Bash symbols must be escaped on STDIN passing'
                     answer = STDIN.readline.chop
 
                     answer = initial if answer == ''
-                    noanswer = ((answer == '') && optional)
+                    noanswer = (answer == '') && optional
                 end while !noanswer && (answer =~ exp).nil?
 
                 if noanswer
@@ -2389,7 +2389,7 @@ Bash symbols must be escaped on STDIN passing'
                         answer = options[answer.to_i]
                     end
 
-                    noanswer = ((answer == '') && optional)
+                    noanswer = (answer == '') && optional
                 end while !noanswer && !options.include?(answer)
 
                 if noanswer

src/cli/one_helper/oneflow_helper.rb

@@ -105,7 +105,10 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
             elsif options[:yaml]
                 [0, array_list.to_yaml(:indent => 4)]
             else
-                format_service_pool.show(array_list)
+                table = format_service_pool
+
+                table.show(array_list, options)
+                table.describe_columns if options[:describe]
 
                 0
             end

src/cli/one_helper/oneflowtemplate_helper.rb

@@ -85,8 +85,11 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
             elsif options[:yaml]
                 [0, JSON.parse(response.body).to_yaml(:indent => 4)]
             else
+                table = format_service_template_pool
                 documents = JSON.parse(response.body)['DOCUMENT_POOL']
-                format_service_template_pool.show(documents['DOCUMENT'])
+
+                table.show(documents['DOCUMENT'], options)
+                table.describe_columns if options[:describe]
 
                 0
             end

src/cli/oneflow

@@ -130,7 +130,8 @@ CommandParser::CmdParser.new(ARGV) do
         List the available services
     EOT
 
-    command :list, list_desc, :options => FORMAT do
+    command :list, list_desc,
+            :options => FORMAT + CLIHelper::OPTIONS + [OpenNebulaHelper::DESCRIBE] do
         helper.list_service_pool(helper.client(options), options)
     end
 

src/cli/oneflow-template

@@ -143,7 +143,8 @@ CommandParser::CmdParser.new(ARGV) do
         List the available Service Templates
     EOT
 
-    command :list, list_desc, :options => FORMAT do
+    command :list, list_desc,
+            :options => FORMAT + CLIHelper::OPTIONS + [OpenNebulaHelper::DESCRIBE] do
         helper.list_service_template_pool(helper.client(options), options)
     end