diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index 59dcd211af..dd87091c70 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -652,7 +652,7 @@ EOT size = $stdout.winsize[0] - 1 # ----------- First page, check if pager is needed ------------- - rc = pool.get_page(size, 0, false) + rc = pool.get_page(size, 0, false, options[:state]) ps = "" return -1, rc.message if OpenNebula.is_error?(rc) @@ -680,7 +680,7 @@ EOT options[:no_header] = true loop do - rc = pool.get_page(size, current, false) + rc = pool.get_page(size, current, false, options[:state]) return -1, rc.message if OpenNebula.is_error?(rc) @@ -731,7 +731,7 @@ EOT size = $stdout.winsize[0] - 1 # ----------- First page, check if pager is needed ------------- - rc = pool.get_page(size, 0, extended) + rc = pool.get_page(size, 0, extended, options[:state]) ps = "" return -1, rc.message if OpenNebula.is_error?(rc) @@ -766,7 +766,7 @@ EOT current = size loop do - rc = pool.get_page(size, current, extended) + rc = pool.get_page(size, current, extended, options[:state]) return -1, rc.message if OpenNebula.is_error?(rc) @@ -815,7 +815,7 @@ EOT size = $stdout.winsize[0] - 1 # ----------- First page, check if pager is needed ------------- - rc = pool.get_page(size, 0, extended) + rc = pool.get_page(size, 0, extended, options[:state]) ps = "" return -1, rc.message if OpenNebula.is_error?(rc) @@ -844,7 +844,7 @@ EOT current = size loop do - rc = pool.get_page(size, current, extended) + rc = pool.get_page(size, current, extended, options[:state]) return -1, rc.message if OpenNebula.is_error?(rc) diff --git a/src/cli/oneprovider b/src/cli/oneprovider index bfe238ac92..9f30788576 100755 --- a/src/cli/oneprovider +++ b/src/cli/oneprovider @@ -150,6 +150,8 @@ CommandParser::CmdParser.new(ARGV) do list_desc, :options => CLIHelper::OPTIONS + [OpenNebulaHelper::FORMAT] do options[:decrypt] = true + options[:state] = OneProvision::Provider::DOCUMENT_TYPE + helper.list_pool(options) end diff --git a/src/cli/oneprovision b/src/cli/oneprovision index f5af5406c8..99d15cfeb1 100755 --- a/src/cli/oneprovision +++ b/src/cli/oneprovision @@ -161,6 +161,8 @@ CommandParser::CmdParser.new(ARGV) do command :list, provision_list_desc, :options => CLIHelper::OPTIONS + [OpenNebulaHelper::FORMAT] do + options[:state] = OneProvision::Provision::DOCUMENT_TYPE + helper.list_pool(options) end diff --git a/src/oca/ruby/opennebula/pool.rb b/src/oca/ruby/opennebula/pool.rb index ffe5c18822..b805adbbcd 100644 --- a/src/oca/ruby/opennebula/pool.rb +++ b/src/oca/ruby/opennebula/pool.rb @@ -233,7 +233,8 @@ module OpenNebula # state state of the objects # hash:: return page as a hash def get_page(size, current, extended = false, state = -1) - rc = nil + rc = nil + state ||= -1 if PAGINATED_POOLS.include?(@pool_name) pool_name = @pool_name.delete('_').downcase