diff --git a/flow/client/bin/appflow b/flow/client/bin/appflow index d011d694d9..7a1488bd3f 100755 --- a/flow/client/bin/appflow +++ b/flow/client/bin/appflow @@ -237,7 +237,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do usage "`appflow` [] []" version OneApps::VERSION_TEXT - set :option, Service::DEFAULT_OPTIONS + set :option, Service::DEFAULT_OPTIONS set :option, CommandParser::VERSION # @@ -251,14 +251,22 @@ cmd=CommandParser::CmdParser.new(ARGV) do OpenNebulaHelper.rname_to_id(arg, "USER") end - set :format, :serviceid, Service.rname_to_id_desc("SERVICE") do |arg| + set :format, :service_id, Service.rname_to_id_desc("SERVICE") do |arg| Service.rname_to_id(arg, "SERVICE") end - set :format, :serviceid_list, Service.list_to_id_desc("SERVICE") do |arg| + set :format, :service_id_list, Service.list_to_id_desc("SERVICE") do |arg| Service.list_to_id(arg, "SERVICE") end + set :format, :vm_action, "Actions supported: #{Role::SCHEDULE_ACTIONS.join(', ')}" do |arg| + if Role::SCHEDULE_ACTIONS.include?(arg) + [0, arg] + else + [-1, "Action #{arg} is not supported. Actions supported: #{Role::SCHEDULE_ACTIONS.join(', ')}"] + end + end + # # List # @@ -285,7 +293,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do Show detailed information of a given service EOT - command :show, show_desc, :serviceid, :options => Service::JSON_FORMAT do + command :show, show_desc, :service_id, :options => Service::JSON_FORMAT do client = Service::Client.new( :username => options[:username], :password => options[:password], @@ -304,7 +312,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do id is specified EOT - command :top, top_desc, [:serviceid, nil], + command :top, top_desc, [:service_id, nil], :options => [Service::JSON_FORMAT, Service::TOP, CLIHelper::DELAY] do client = Service::Client.new( :username => options[:username], @@ -349,7 +357,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do Delete a given service EOT - command :delete, delete_desc, [:range, :serviceid_list] do + command :delete, delete_desc, [:range, :service_id_list] do client = Service::Client.new( :username => options[:username], :password => options[:password], @@ -371,7 +379,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do From FAILED_UNDEPLOYING continues shutting down the Service EOT - command :shutdown, shutdown_desc, [:range, :serviceid_list] do + command :shutdown, shutdown_desc, [:range, :service_id_list] do client = Service::Client.new( :username => options[:username], :password => options[:password], @@ -394,7 +402,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do From FAILED_DEPLOYING continues deploying the Service EOT - command :deploy, deploy_desc, [:range, :serviceid_list] do + command :deploy, deploy_desc, [:range, :service_id_list] do client = Service::Client.new( :username => options[:username], :password => options[:password], @@ -412,7 +420,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do Changes the service group EOT - command :chgrp, chgrp_desc, [:range, :serviceid_list], :groupid do + command :chgrp, chgrp_desc, [:range, :service_id_list], :groupid do client = Service::Client.new( :username => options[:username], :password => options[:password], @@ -433,7 +441,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do Changes the service owner and group EOT - command :chown, chown_desc, [:range, :serviceid_list], :userid, [:groupid, nil] do + command :chown, chown_desc, [:range, :service_id_list], :userid, [:groupid, nil] do client = Service::Client.new( :username => options[:username], :password => options[:password], @@ -455,7 +463,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do Changes the service permissions EOT - command :chmod, chmod_desc, [:range, :serviceid_list], :octet do + command :chmod, chmod_desc, [:range, :service_id_list], :octet do client = Service::Client.new( :username => options[:username], :password => options[:password], @@ -471,4 +479,24 @@ cmd=CommandParser::CmdParser.new(ARGV) do client.post("#{RESOURCE_PATH}/#{service_id}/action", json_action) } end + + batch_action_desc = <<-EOT.unindent + Changes the service permissions + EOT + + command :"batch-action", batch_action_desc, :service_id, :role_name, :vm_action do + client = Service::Client.new( + :username => options[:username], + :password => options[:password], + :url => options[:server], + :user_agent => USER_AGENT) + + Service.perform_actions([args[0]]) { |service_id| + params = Hash.new + + json_action = Service.build_json_action(args[2], params) + + client.post("#{RESOURCE_PATH}/#{service_id}/role/#{args[1]}/action", json_action) + } + end end \ No newline at end of file diff --git a/flow/client/lib/appflow_client.rb b/flow/client/lib/appflow_client.rb index 13078669e2..af32cdd268 100644 --- a/flow/client/lib/appflow_client.rb +++ b/flow/client/lib/appflow_client.rb @@ -20,6 +20,24 @@ require 'cloud/CloudClient' include CloudCLI module Role + # Actions that can be performed on the VMs of a given Role + SCHEDULE_ACTIONS = [ + 'shutdown', + 'delete', + 'hold', + 'release', + 'stop', + 'shutdown-hard', + 'suspend', + 'resume', + 'boot', + 'delete-recreate', + 'reboot', + 'reboot-hard', + 'poweroff', + 'snapshot-create' + ] + STATE = { 'PENDING' => 0, 'DEPLOYING' => 1,