bug #4226: Do not reuse client in update actions

src/cli/one_helper.rb

@@ -665,12 +665,12 @@ EOT
             end
         end
 
-        private
-
         def retrieve_resource(id)
             factory(id)
         end
 
+        private
+
         def pool_to_array(pool)
             if !pool.instance_of?(Hash)
                 phash = pool.to_hash

src/cli/onecluster

@@ -194,6 +194,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

src/cli/onedatastore

@@ -171,6 +171,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

src/cli/onegroup

@@ -130,6 +130,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

src/cli/onehost

@@ -174,6 +174,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

src/cli/oneimage

@@ -223,6 +223,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

src/cli/onesecgroup

@@ -166,6 +166,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

src/cli/onetemplate

@@ -293,6 +293,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

src/cli/oneuser

@@ -210,6 +210,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

src/cli/onevdc

@@ -148,6 +148,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

src/cli/onevm

@@ -263,6 +263,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1], 'USER_TEMPLATE')
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

src/cli/onevnet

@@ -329,6 +329,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end
@@ -365,6 +368,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             str = OpenNebulaHelper.update_template_helper(false, args[0], obj,
                 args[2], "AR_POOL", false)
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update_ar(str)
         end
     end

src/cli/onezone

@@ -105,6 +105,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end