From bd592c6a5bb66db49733d793add758a1bddb9543 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 21 Jun 2013 11:43:44 +0200 Subject: [PATCH] Feature #2120: Show shutdown_action in CLI --- flow/client/bin/appflow | 4 +++- flow/controllers/appflow-server.rb | 3 --- flow/models/Role.rb | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flow/client/bin/appflow b/flow/client/bin/appflow index 4a330b9556..92a5d908c5 100755 --- a/flow/client/bin/appflow +++ b/flow/client/bin/appflow @@ -191,6 +191,7 @@ def show_service(client, args, options) puts str % ["STRATEGY", template['deployment']] puts str % ["SERVICE STATE", Service.state_str(template['state'])] + puts str % ["SHUTDOWN", template['shutdown_action']] if template['shutdown_action'] puts @@ -212,8 +213,9 @@ def show_service(client, args, options) puts str % ["ROLE STATE", Role.state_str(role['state'])] puts str % ["PARENTS", role['parents'].join(', ')] if role['parents'] - puts str % ["CARNIDALITY", role['cardinality']||1] + puts str % ["CARNIDALITY", role['cardinality']] puts str % ["VM TEMPLATE", role['vm_template']] + puts str % ["SHUTDOWN", role['shutdown_action']] if role['shutdown_action'] puts "NODES INFORMATION" NODE_TABLE.show(role['nodes']) diff --git a/flow/controllers/appflow-server.rb b/flow/controllers/appflow-server.rb index ad00773a1b..e4916dca5e 100644 --- a/flow/controllers/appflow-server.rb +++ b/flow/controllers/appflow-server.rb @@ -291,10 +291,7 @@ post '/service/:id/role/:role_name/action' do if role.nil? rc = OpenNebula::Error.new("Role '#{params[:role_name]}' not found") else - # TODO: opts['period'], opts['number'] check be integer - # Use defaults only if one of the options is supplied - if opts['period'].nil? ^ opts['number'].nil? opts['period'] = conf[:action_period] if opts['period'].nil? opts['number'] = conf[:action_number] if opts['number'].nil? diff --git a/flow/models/Role.rb b/flow/models/Role.rb index 861e54717f..4276fa5b9d 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -406,6 +406,8 @@ module OpenNebula def batch_action(action, period, vms_per_period) vms_id = [] + # TODO: check action is a valid string, period vm_per_period integer + error_msgs = [] nodes = @body['nodes'] now = Time.now.to_i