Rename OpConnectConsole and LUConnectConsole

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>

diff --git a/NEWS b/NEWS
index 1f93f44..b515856 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -39,7 +39,7 @@ Integration
   symlink
 - Added new tool for running commands on many machines,
   ``tools/ganeti-listrunner``
-- Implemented more verbose result in ``OpConnectConsole`` opcode, also
+- Implemented more verbose result in ``OpInstanceConsole`` opcode, also
   improving the ``gnt-instance console`` output
 - Allowed customisation of disk index separator at ``configure`` time
 - Export node group allocation policy to :doc:`iallocator <iallocator>`

diff --git a/doc/design-2.3.rst b/doc/design-2.3.rst
index abd8c30..f04ab8e 100644 (file)
--- a/doc/design-2.3.rst
+++ b/doc/design-2.3.rst
@@ -291,7 +291,7 @@ By default, all LUs will invalidate the caches for all nodes and
 instances they lock. If an LU uses the BGL, then it will invalidate the
 entire cache. In time, it is expected that LUs will be modified to not
 invalidate, if they are not expected to change the node's and/or
-instance's state (e.g. ``LUConnectConsole``, or
+instance's state (e.g. ``LUInstanceConsole``, or
 ``LUInstanceActivateDisks``).
 
 Invalidation of a node's properties will also invalidate the capacity

diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 0029a53..8799a54 100644 (file)
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -888,7 +888,7 @@ def ConnectToInstanceConsole(opts, args):
   """
   instance_name = args[0]
 
-  op = opcodes.OpConnectConsole(instance_name=instance_name)
+  op = opcodes.OpInstanceConsole(instance_name=instance_name)
 
   cl = GetClient()
   try:
@@ -906,7 +906,7 @@ def ConnectToInstanceConsole(opts, args):
 
 def _DoConsole(console, show_command, cluster_name, feedback_fn=ToStdout,
                _runcmd_fn=utils.RunCmd):
-  """Acts based on the result of L{opcodes.OpConnectConsole}.
+  """Acts based on the result of L{opcodes.OpInstanceConsole}.
 
   @type console: L{objects.InstanceConsole}
   @param console: Console object

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index c0cf439..1d3d9a7 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -7686,7 +7686,7 @@ class LUCreateInstance(LogicalUnit):
     return list(iobj.all_nodes)
 
 
-class LUConnectConsole(NoHooksLU):
+class LUInstanceConsole(NoHooksLU):
   """Connect to an instance's console.
 
   This is somewhat special in that it returns the command line that

diff --git a/lib/opcodes.py b/lib/opcodes.py
index b221f58..694a88f 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -925,7 +925,7 @@ class OpMoveInstance(OpCode):
     ]
 
 
-class OpConnectConsole(OpCode):
+class OpInstanceConsole(OpCode):
   """Connect to an instance's console."""
   OP_ID = "OP_INSTANCE_CONSOLE"
   OP_DSC_FIELD = "instance_name"