1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00

F #5364: add list options to (un)lock CLI cmds (#1173)

(cherry picked from commit 3cd833a43a1b0e108fa04a7d51d0de254c15829e)
This commit is contained in:
Alejandro Huertas Herrero 2021-05-04 10:45:01 +02:00 committed by Ruben S. Montero
parent e2d1cd6e6a
commit d75c203b3a
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
9 changed files with 41 additions and 41 deletions

View File

@ -254,9 +254,9 @@ CommandParser::CmdParser.new(ARGV) do
[Admin]: locks only Admin actions.
EOT
command :lock, lock_desc, :hookid,
command :lock, lock_desc, [:range, :hookid_list],
:options => [USE, MANAGE, ADMIN, ALL] do
helper.perform_action(args[0], options, 'Hook locked') do |t|
helper.perform_actions(args[0], options, 'Hook locked') do |t|
if !options[:use].nil?
level = 1
elsif !options[:manage].nil?
@ -277,8 +277,8 @@ CommandParser::CmdParser.new(ARGV) do
Valid states are: All.
EOT
command :unlock, unlock_desc, :hookid do
helper.perform_action(args[0], options, 'Hook unlocked') do |t|
command :unlock, unlock_desc, [:range, :hookid_list] do
helper.perform_actions(args[0], options, 'Hook unlocked') do |t|
t.unlock
end
end

View File

@ -434,9 +434,9 @@ CommandParser::CmdParser.new(ARGV) do
[Admin]: locks only Admin actions.
EOT
command :lock, lock_desc, :imageid,
command :lock, lock_desc, [:range, :imageid_list],
:options => [USE, MANAGE, ADMIN, ALL] do
helper.perform_action(args[0], options, 'Image locked') do |i|
helper.perform_actions(args[0], options, 'Image locked') do |i|
if !options[:use].nil?
level = 1
elsif !options[:manage].nil?
@ -457,8 +457,8 @@ CommandParser::CmdParser.new(ARGV) do
Valid states are: All.
EOT
command :unlock, unlock_desc, :imageid do
helper.perform_action(args[0], options, 'Image unlocked') do |i|
command :unlock, unlock_desc, [:range, :imageid_list] do
helper.perform_actions(args[0], options, 'Image unlocked') do |i|
i.unlock
end
end

View File

@ -438,11 +438,11 @@ CommandParser::CmdParser.new(ARGV) do
[Admin]: locks only Admin actions.
EOT
command :lock, lock_desc, :appid,
command :lock, lock_desc, [:range, :appid_list],
:options => [USE, MANAGE, ADMIN, ALL] do
helper.perform_action(args[0],
options,
'MarketPlaceApp locked') do |app|
helper.perform_actions(args[0],
options,
'MarketPlaceApp locked') do |app|
if !options[:use].nil?
level = 1
elsif !options[:manage].nil?
@ -463,10 +463,10 @@ CommandParser::CmdParser.new(ARGV) do
Valid states are: All.
EOT
command :unlock, unlock_desc, :appid do
helper.perform_action(args[0],
options,
'MarketPlaceApp unlocked') do |app|
command :unlock, unlock_desc, [:range, :appid_list] do
helper.perform_actions(args[0],
options,
'MarketPlaceApp unlocked') do |app|
app.unlock
end
end

View File

@ -395,9 +395,9 @@ CommandParser::CmdParser.new(ARGV) do
[Admin]: locks only Admin actions.
EOT
command :lock, lock_desc, :templateid,
command :lock, lock_desc, [:range, :templateid_list],
:options => [USE, MANAGE, ADMIN, ALL] do
helper.perform_action(args[0], options, 'Template locked') do |t|
helper.perform_actions(args[0], options, 'Template locked') do |t|
if !options[:use].nil?
level = 1
elsif !options[:manage].nil?
@ -418,8 +418,8 @@ CommandParser::CmdParser.new(ARGV) do
Valid states are: All.
EOT
command :unlock, unlock_desc, :templateid do
helper.perform_action(args[0], options, 'Template unlocked') do |t|
command :unlock, unlock_desc, [:range, :templateid_list] do
helper.perform_actions(args[0], options, 'Template unlocked') do |t|
t.unlock
end
end

View File

@ -1324,9 +1324,9 @@ CommandParser::CmdParser.new(ARGV) do
Valid states are: All.
EOT
command :lock, lock_desc, :vmid,
command :lock, lock_desc, [:range, :vmid_list],
:options => [USE, MANAGE, ADMIN, ALL] do
helper.perform_action(args[0], options, 'VM locked') do |vm|
helper.perform_actions(args[0], options, 'VM locked') do |vm|
if !options[:use].nil?
level = 1
elsif !options[:manage].nil?
@ -1347,8 +1347,8 @@ CommandParser::CmdParser.new(ARGV) do
Valid states are: All.
EOT
command :unlock, unlock_desc, :vmid do
helper.perform_action(args[0], options, 'VM unlocked') do |vm|
command :unlock, unlock_desc, [:range, :vmid_list] do
helper.perform_actions(args[0], options, 'VM unlocked') do |vm|
vm.unlock
end
end
@ -1361,7 +1361,7 @@ CommandParser::CmdParser.new(ARGV) do
You can configure the actions in /etc/one/cli/onevm.yaml
EOT
command :'create-chart', create_chart_desc, [:range, :vmid_list] do
command :'create-chart', create_chart_desc, :vmid do
charters = helper.get_charters
if charters.nil?

View File

@ -231,9 +231,9 @@ CommandParser::CmdParser.new(ARGV) do
[Admin]: locks only Admin actions.
EOT
command :lock, lock_desc, :vmgroupid,
command :lock, lock_desc, [:range, :vmgroupid_list],
:options => [USE, MANAGE, ADMIN, ALL] do
helper.perform_action(args[0], options, 'VMGroup locked') do |vmg|
helper.perform_actions(args[0], options, 'VMGroup locked') do |vmg|
if !options[:use].nil?
level = 1
elsif !options[:manage].nil?
@ -254,8 +254,8 @@ CommandParser::CmdParser.new(ARGV) do
Valid states are: All.
EOT
command :unlock, unlock_desc, :vmgroupid do
helper.perform_action(args[0], options, 'VMGroup unlocked') do |vmg|
command :unlock, unlock_desc, [:range, :vmgroupid_list] do
helper.perform_actions(args[0], options, 'VMGroup unlocked') do |vmg|
vmg.unlock
end
end

View File

@ -379,9 +379,9 @@ CommandParser::CmdParser.new(ARGV) do
[Admin]: locks only Admin actions.
EOT
command :lock, lock_desc, :vnetid,
command :lock, lock_desc, [:range, :vnetid_list],
:options => [USE, MANAGE, ADMIN, ALL] do
helper.perform_action(args[0], options, 'VNet locked') do |vnet|
helper.perform_actions(args[0], options, 'VNet locked') do |vnet|
if !options[:use].nil?
level = 1
elsif !options[:manage].nil?
@ -402,8 +402,8 @@ CommandParser::CmdParser.new(ARGV) do
Valid states are: All.
EOT
command :unlock, unlock_desc, :vnetid do
helper.perform_action(args[0], options, 'VNet unlocked') do |vnet|
command :unlock, unlock_desc, [:range, :vnetid_list] do
helper.perform_actions(args[0], options, 'VNet unlocked') do |vnet|
vnet.unlock
end
end

View File

@ -339,9 +339,9 @@ CommandParser::CmdParser.new(ARGV) do
[Admin]: locks only Admin actions.
EOT
command :lock, lock_desc, :templateid,
command :lock, lock_desc, [:range, :templateid_list],
:options => [USE, MANAGE, ADMIN, ALL] do
helper.perform_action(args[0], options, 'VN Template locked') do |t|
helper.perform_actions(args[0], options, 'VN Template locked') do |t|
if !options[:use].nil?
level = 1
elsif !options[:manage].nil?
@ -362,8 +362,8 @@ CommandParser::CmdParser.new(ARGV) do
Valid states are: All.
EOT
command :unlock, unlock_desc, :templateid do
helper.perform_action(args[0], options, 'VN Template unlocked') do |t|
command :unlock, unlock_desc, [:range, :templateid_list] do
helper.perform_actions(args[0], options, 'VN Template unlocked') do |t|
t.unlock
end
end

View File

@ -364,9 +364,9 @@ CommandParser::CmdParser.new(ARGV) do
[Admin]: locks only Admin actions.
EOT
command :lock, lock_desc, :vrouterid,
command :lock, lock_desc, [:range, :vrouterid_list],
:options => [USE, MANAGE, ADMIN, ALL] do
helper.perform_action(args[0], options, 'VRouter locked') do |vr|
helper.perform_actions(args[0], options, 'VRouter locked') do |vr|
if !options[:use].nil?
level = 1
elsif !options[:manage].nil?
@ -387,8 +387,8 @@ CommandParser::CmdParser.new(ARGV) do
valid states are: All.
EOT
command :unlock, unlock_desc, :vrouterid do
helper.perform_action(args[0], options, 'VRouter unlocked') do |vr|
command :unlock, unlock_desc, [:range, :vrouterid_list] do
helper.perform_actions(args[0], options, 'VRouter unlocked') do |vr|
vr.unlock
end
end