Fix a few commands behaviour with dry-run

These commands use or display the result from the LU, so in case of
dry-run, they will crash or display just 'None'. At least checking that
the result is 'true' (in the boolean sense) will make them work better.

As for gnt-os modify, it didn't pass the 'opts' parameter properly to
SubmitOpCode, so the dry-run option was silently ignored.

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index efd49ea..66afdc7 100755 (executable)
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -179,7 +179,8 @@ def RenameCluster(opts, args):
   op = opcodes.OpRenameCluster(name=new_name)
   result = SubmitOpCode(op, opts=opts, cl=cl)
 
-  ToStdout("Cluster renamed from '%s' to '%s'", cluster_name, result)
+  if result:
+    ToStdout("Cluster renamed from '%s' to '%s'", cluster_name, result)
 
   return 0
 

diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index 75ecd63..cd3dc20 100755 (executable)
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -639,7 +639,8 @@ def RenameInstance(opts, args):
                                 name_check=opts.name_check)
   result = SubmitOrSend(op, opts)
 
-  ToStdout("Instance '%s' renamed to '%s'", args[0], result)
+  if result:
+    ToStdout("Instance '%s' renamed to '%s'", args[0], result)
 
   return 0
 

diff --git a/scripts/gnt-node b/scripts/gnt-node
index b3d911f..f8048af 100755 (executable)
--- a/scripts/gnt-node
+++ b/scripts/gnt-node
@@ -449,7 +449,8 @@ def PowercycleNode(opts, args):
 
   op = opcodes.OpPowercycleNode(node_name=node, force=opts.force)
   result = SubmitOpCode(op, opts=opts)
-  ToStderr(result)
+  if result:
+    ToStderr(result)
   return 0
 
 

diff --git a/scripts/gnt-os b/scripts/gnt-os
index fd96cbe..ff3e4cf 100755 (executable)
--- a/scripts/gnt-os
+++ b/scripts/gnt-os
@@ -254,7 +254,7 @@ def ModifyOS(opts, args):
                                   candidate_pool_size=None,
                                   os_hvp=os_hvp,
                                   osparams=osp)
-  SubmitOpCode(op)
+  SubmitOpCode(op, opts=opts)
 
   return 0