From 98a1085f7ca1a63e315ec3fc505870cdffba8d30 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Tue, 12 Apr 2016 11:20:48 +0200 Subject: [PATCH] bug #4226: fix timeout for quota commands --- src/cli/oneuser | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/cli/oneuser b/src/cli/oneuser index 5aecae946e..d5e6aa5798 100755 --- a/src/cli/oneuser +++ b/src/cli/oneuser @@ -232,6 +232,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do end str = OneQuotaHelper.set_quota(user, args[1]) + + helper.set_client(options) + user = helper.retrieve_resource(user.id) + rc = user.set_quota(str) if OpenNebula.is_error?(rc) @@ -250,14 +254,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do [:file, nil] do batch_str = OneQuotaHelper.get_batch_quota(args[1]) + helper.set_client(options) helper.perform_actions(args[0], options, "modified") do |user| str = OneQuotaHelper.merge_quota(user, batch_str) if OpenNebula.is_error?(str) str else - rc = user.set_quota(str) - rc + user.set_quota(str) end end end @@ -279,6 +283,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do str = OneQuotaHelper.set_quota(default_quotas, args[0], true) + system = System.new(OneUserHelper.get_client(options, true)) rc = system.set_user_quotas(str) if OpenNebula.is_error?(rc)