From 30e91e9a67184527c86371d851d811c8e2859d28 Mon Sep 17 00:00:00 2001
From: sergiojvg <svega@opennebula.systems>
Date: Fri, 21 Sep 2018 12:34:49 -0400
Subject: [PATCH] Fix paginated CLI output on onehost show and oneimage show
 (#2446)

(cherry picked from commit fe3b320b098ab62c9ba169e4df5c7a9019dcbec6)
---
 src/cli/one_helper.rb                 | 2 +-
 src/cli/one_helper/onehost_helper.rb  | 2 +-
 src/cli/one_helper/oneimage_helper.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb
index 86db43af18..068835b16c 100644
--- a/src/cli/one_helper.rb
+++ b/src/cli/one_helper.rb
@@ -581,7 +581,7 @@ EOT
         # output
         #-----------------------------------------------------------------------
         def list_pool_table(table, pool, options, filter_flag)
-            if $stdout.isatty 
+            if $stdout.isatty and (!options.key?:no_pager) 
                 size = $stdout.winsize[0] - 1 
 
                 # ----------- First page, check if pager is needed -------------
diff --git a/src/cli/one_helper/onehost_helper.rb b/src/cli/one_helper/onehost_helper.rb
index 365f8017a3..5f0f0a4c67 100644
--- a/src/cli/one_helper/onehost_helper.rb
+++ b/src/cli/one_helper/onehost_helper.rb
@@ -533,7 +533,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
 
         onevm_helper=OneVMHelper.new
         onevm_helper.client=@client
-        onevm_helper.list_pool({:filter=>["HOST=#{host.name}"]}, false)
+        onevm_helper.list_pool({:filter=>["HOST=#{host.name}"], :no_pager => true}, false)
     end
 
     def print_pcis(pcis)
diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb
index 6effbcc154..4b4cc80579 100644
--- a/src/cli/one_helper/oneimage_helper.rb
+++ b/src/cli/one_helper/oneimage_helper.rb
@@ -320,7 +320,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
             vms.map!{|e| e.to_i }
             onevm_helper=OneVMHelper.new
             onevm_helper.client=@client
-            onevm_helper.list_pool({:ids=>vms}, false)
+            onevm_helper.list_pool({:ids=>vms, :no_pager => true}, false)
         end
     end