Rename OpQueryInstanceData and LUQueryInstanceData

[ganeti-local] / lib / client / gnt_cluster.py

diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index de5a60d..90c4a51 100644 (file)
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -435,7 +435,7 @@ def VerifyCluster(opts, args):
   skip_checks = []
   if opts.skip_nplusone_mem:
     skip_checks.append(constants.VERIFY_NPLUSONE_MEM)
-  op = opcodes.OpVerifyCluster(skip_checks=skip_checks,
+  op = opcodes.OpClusterVerify(skip_checks=skip_checks,
                                verbose=opts.verbose,
                                error_codes=opts.error_codes,
                                debug_simulate_errors=opts.simulate_errors)
@@ -457,10 +457,10 @@ def VerifyDisks(opts, args):
   """
   cl = GetClient()
 
-  op = opcodes.OpVerifyDisks()
+  op = opcodes.OpClusterVerifyDisks()
   result = SubmitOpCode(op, opts=opts, cl=cl)
   if not isinstance(result, (list, tuple)) or len(result) != 3:
-    raise errors.ProgrammerError("Unknown result type for OpVerifyDisks")
+    raise errors.ProgrammerError("Unknown result type for OpClusterVerifyDisks")
 
   bad_nodes, instances, missing = result
 
@@ -477,7 +477,7 @@ def VerifyDisks(opts, args):
     for iname in instances:
       if iname in missing:
         continue
-      op = opcodes.OpActivateInstanceDisks(instance_name=iname)
+      op = opcodes.OpInstanceActivateDisks(instance_name=iname)
       try:
         ToStdout("Activating disks for instance '%s'", iname)
         SubmitOpCode(op, opts=opts, cl=cl)