Commit dc28c4e4 authored by Iustin Pop's avatar Iustin Pop
Browse files

Rename OpQueryInstanceData and LUQueryInstanceData


Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
parent f2af0bec
...@@ -303,7 +303,7 @@ Workflow ...@@ -303,7 +303,7 @@ Workflow
instance specification and for the public part of an encryption key instance specification and for the public part of an encryption key
- Instance information can already be retrieved using an existing API - Instance information can already be retrieved using an existing API
(``OpQueryInstanceData``). (``OpInstanceQueryData``).
- An RSA encryption key and a corresponding self-signed X509 - An RSA encryption key and a corresponding self-signed X509
certificate is generated using the "openssl" command. This key will certificate is generated using the "openssl" command. This key will
be used to encrypt the data sent to the destination cluster. be used to encrypt the data sent to the destination cluster.
......
...@@ -1142,7 +1142,7 @@ def ShowInstanceConfig(opts, args): ...@@ -1142,7 +1142,7 @@ def ShowInstanceConfig(opts, args):
return 1 return 1
retcode = 0 retcode = 0
op = opcodes.OpQueryInstanceData(instances=args, static=opts.static) op = opcodes.OpInstanceQueryData(instances=args, static=opts.static)
result = SubmitOpCode(op, opts=opts) result = SubmitOpCode(op, opts=opts)
if not result: if not result:
ToStdout("No instances.") ToStdout("No instances.")
......
...@@ -872,7 +872,7 @@ def _NICListToTuple(lu, nics): ...@@ -872,7 +872,7 @@ def _NICListToTuple(lu, nics):
"""Build a list of nic information tuples. """Build a list of nic information tuples.
This list is suitable to be passed to _BuildInstanceHookEnv or as a return This list is suitable to be passed to _BuildInstanceHookEnv or as a return
value in LUQueryInstanceData. value in LUInstanceQueryData.
@type lu: L{LogicalUnit} @type lu: L{LogicalUnit}
@param lu: the logical unit on whose behalf we execute @param lu: the logical unit on whose behalf we execute
...@@ -8685,7 +8685,7 @@ class LUInstanceGrowDisk(LogicalUnit): ...@@ -8685,7 +8685,7 @@ class LUInstanceGrowDisk(LogicalUnit):
" sync mode was requested.") " sync mode was requested.")
class LUQueryInstanceData(NoHooksLU): class LUInstanceQueryData(NoHooksLU):
"""Query runtime instance data. """Query runtime instance data.
""" """
......
...@@ -973,7 +973,7 @@ class OpInstanceQuery(OpCode): ...@@ -973,7 +973,7 @@ class OpInstanceQuery(OpCode):
] ]
class OpQueryInstanceData(OpCode): class OpInstanceQueryData(OpCode):
"""Compute the run-time status of instances.""" """Compute the run-time status of instances."""
OP_ID = "OP_INSTANCE_QUERY_DATA" OP_ID = "OP_INSTANCE_QUERY_DATA"
OP_PARAMS = [ OP_PARAMS = [
......
...@@ -950,7 +950,7 @@ class R_2_instances_name_info(baserlib.R_Generic): ...@@ -950,7 +950,7 @@ class R_2_instances_name_info(baserlib.R_Generic):
instance_name = self.items[0] instance_name = self.items[0]
static = bool(self._checkIntVariable("static", default=0)) static = bool(self._checkIntVariable("static", default=0))
op = opcodes.OpQueryInstanceData(instances=[instance_name], op = opcodes.OpInstanceQueryData(instances=[instance_name],
static=static) static=static)
return baserlib.SubmitJob([op]) return baserlib.SubmitJob([op])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment