From bd8210a75332bf6472bf71d9fd5c18581d1e4a34 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sat, 15 Jan 2011 12:56:05 +0100
Subject: [PATCH] Rename OpVerifyDisks and LUVerifyDisks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
lib/client/gnt_cluster.py | 4 ++--
lib/cmdlib.py | 2 +-
lib/opcodes.py | 2 +-
lib/watcher/__init__.py | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index f3de68f2d..39c1a4e0e 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -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
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index d5e4df337..82a37bbf2 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2381,7 +2381,7 @@ class LUClusterVerify(LogicalUnit):
return lu_result
-class LUVerifyDisks(NoHooksLU):
+class LUClusterVerifyDisks(NoHooksLU):
"""Verifies the cluster disks status.
"""
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 277a8f1f9..e63795534 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -416,7 +416,7 @@ class OpClusterVerify(OpCode):
]
-class OpVerifyDisks(OpCode):
+class OpClusterVerifyDisks(OpCode):
"""Verify the cluster disks.
Parameters: none
diff --git a/lib/watcher/__init__.py b/lib/watcher/__init__.py
index 9abdade42..6a01ef321 100644
--- a/lib/watcher/__init__.py
+++ b/lib/watcher/__init__.py
@@ -580,7 +580,7 @@ class Watcher(object):
"""Run gnt-cluster verify-disks.
"""
- op = opcodes.OpVerifyDisks()
+ op = opcodes.OpClusterVerifyDisks()
job_id = client.SubmitJob([op])
result = cli.PollJob(job_id, cl=client, feedback_fn=logging.debug)[0]
client.ArchiveJob(job_id)
--
GitLab