From 83f5d4752fcb3025fa9860857344580b16762790 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sat, 15 Jan 2011 12:56:10 +0100
Subject: [PATCH] Rename OpActivateInstanceDisks and LUActivateInstanceDisks
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.3.rst | 2 +-
lib/client/gnt_cluster.py | 2 +-
lib/client/gnt_instance.py | 2 +-
lib/cmdlib.py | 2 +-
lib/opcodes.py | 2 +-
lib/rapi/rlib2.py | 2 +-
lib/watcher/__init__.py | 4 ++--
tools/burnin | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/doc/design-2.3.rst b/doc/design-2.3.rst
index 3fc3b2c96..abd8c3063 100644
--- a/doc/design-2.3.rst
+++ b/doc/design-2.3.rst
@@ -292,7 +292,7 @@ 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
-``LUActivateInstanceDisks``).
+``LUInstanceActivateDisks``).
Invalidation of a node's properties will also invalidate the capacity
data associated with that node.
diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index 39c1a4e0e..90c4a5123 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -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)
diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index bb2079f3d..0029a53e4 100644
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -589,7 +589,7 @@ def ActivateDisks(opts, args):
"""
instance_name = args[0]
- op = opcodes.OpActivateInstanceDisks(instance_name=instance_name,
+ op = opcodes.OpInstanceActivateDisks(instance_name=instance_name,
ignore_size=opts.ignore_size)
disks_info = SubmitOrSend(op, opts)
for host, iname, nname in disks_info:
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index e4591a29f..c0cf439c3 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -4621,7 +4621,7 @@ class LUClusterConfigQuery(NoHooksLU):
return values
-class LUActivateInstanceDisks(NoHooksLU):
+class LUInstanceActivateDisks(NoHooksLU):
"""Bring up an instance's disks.
"""
diff --git a/lib/opcodes.py b/lib/opcodes.py
index e1c38a518..b221f582b 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -934,7 +934,7 @@ class OpConnectConsole(OpCode):
]
-class OpActivateInstanceDisks(OpCode):
+class OpInstanceActivateDisks(OpCode):
"""Activate an instance's disks."""
OP_ID = "OP_INSTANCE_ACTIVATE_DISKS"
OP_DSC_FIELD = "instance_name"
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 5b2f81847..58da35b63 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -1120,7 +1120,7 @@ class R_2_instances_name_activate_disks(baserlib.R_Generic):
instance_name = self.items[0]
ignore_size = bool(self._checkIntVariable('ignore_size'))
- op = opcodes.OpActivateInstanceDisks(instance_name=instance_name,
+ op = opcodes.OpInstanceActivateDisks(instance_name=instance_name,
ignore_size=ignore_size)
return baserlib.SubmitJob([op])
diff --git a/lib/watcher/__init__.py b/lib/watcher/__init__.py
index 6a01ef321..1d873d6e6 100644
--- a/lib/watcher/__init__.py
+++ b/lib/watcher/__init__.py
@@ -406,7 +406,7 @@ class Instance(object):
"""Encapsulates the activation of all disks of an instance.
"""
- op = opcodes.OpActivateInstanceDisks(instance_name=self.name)
+ op = opcodes.OpInstanceActivateDisks(instance_name=self.name)
cli.SubmitOpCode(op, cl=client)
@@ -595,7 +595,7 @@ class Watcher(object):
utils.CommaJoin(offline_disk_instances))
# we submit only one job, and wait for it. not optimal, but spams
# less the job queue
- job = [opcodes.OpActivateInstanceDisks(instance_name=name)
+ job = [opcodes.OpInstanceActivateDisks(instance_name=name)
for name in offline_disk_instances]
job_id = cli.SendJob(job, cl=client)
diff --git a/tools/burnin b/tools/burnin
index 5921dc457..3adbe8396 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -847,7 +847,7 @@ class Burner(object):
for instance in self.instances:
Log("instance %s", instance, indent=1)
op_start = self.StartInstanceOp(instance)
- op_act = opcodes.OpActivateInstanceDisks(instance_name=instance)
+ op_act = opcodes.OpInstanceActivateDisks(instance_name=instance)
op_deact = opcodes.OpDeactivateInstanceDisks(instance_name=instance)
op_stop = self.StopInstanceOp(instance)
Log("activate disks when online", indent=2)
--
GitLab