From dc28c4e41b1e3c85632279d5608782c30b60afb1 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sat, 15 Jan 2011 12:57:45 +0100
Subject: [PATCH] Rename OpQueryInstanceData and LUQueryInstanceData
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>
---
doc/design-2.2.rst | 2 +-
lib/client/gnt_instance.py | 2 +-
lib/cmdlib.py | 4 ++--
lib/opcodes.py | 2 +-
lib/rapi/rlib2.py | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/design-2.2.rst b/doc/design-2.2.rst
index 453b17d9a..87a268aa9 100644
--- a/doc/design-2.2.rst
+++ b/doc/design-2.2.rst
@@ -303,7 +303,7 @@ Workflow
instance specification and for the public part of an encryption key
- Instance information can already be retrieved using an existing API
- (``OpQueryInstanceData``).
+ (``OpInstanceQueryData``).
- An RSA encryption key and a corresponding self-signed X509
certificate is generated using the "openssl" command. This key will
be used to encrypt the data sent to the destination cluster.
diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 839cf1328..9c97aac04 100644
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -1142,7 +1142,7 @@ def ShowInstanceConfig(opts, args):
return 1
retcode = 0
- op = opcodes.OpQueryInstanceData(instances=args, static=opts.static)
+ op = opcodes.OpInstanceQueryData(instances=args, static=opts.static)
result = SubmitOpCode(op, opts=opts)
if not result:
ToStdout("No instances.")
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 8569cf3a4..d6a9254c5 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -872,7 +872,7 @@ def _NICListToTuple(lu, nics):
"""Build a list of nic information tuples.
This list is suitable to be passed to _BuildInstanceHookEnv or as a return
- value in LUQueryInstanceData.
+ value in LUInstanceQueryData.
@type lu: L{LogicalUnit}
@param lu: the logical unit on whose behalf we execute
@@ -8685,7 +8685,7 @@ class LUInstanceGrowDisk(LogicalUnit):
" sync mode was requested.")
-class LUQueryInstanceData(NoHooksLU):
+class LUInstanceQueryData(NoHooksLU):
"""Query runtime instance data.
"""
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 5b993eeae..7a0dd7c6c 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -973,7 +973,7 @@ class OpInstanceQuery(OpCode):
]
-class OpQueryInstanceData(OpCode):
+class OpInstanceQueryData(OpCode):
"""Compute the run-time status of instances."""
OP_ID = "OP_INSTANCE_QUERY_DATA"
OP_PARAMS = [
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index a2f278208..98dc70f02 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -950,7 +950,7 @@ class R_2_instances_name_info(baserlib.R_Generic):
instance_name = self.items[0]
static = bool(self._checkIntVariable("static", default=0))
- op = opcodes.OpQueryInstanceData(instances=[instance_name],
+ op = opcodes.OpInstanceQueryData(instances=[instance_name],
static=static)
return baserlib.SubmitJob([op])
--
GitLab