shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

M #-: fix provision paginated outputs (#594)

Browse Source
This commit is contained in:
Alejandro Huertas Herrero 2021-01-07 10:12:47 +01:00 committed by GitHub
parent 6f84f59a04
commit 6959746c47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cli/one_helper.rb
View File

@ -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)

2
src/cli/oneprovider
View File

@ -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

2
src/cli/oneprovision
View File

@ -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

3
src/oca/ruby/opennebula/pool.rb
View File

@ -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