From ca5890ad647869bd6411c44dc285aeadb7303cd2 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sat, 15 Jan 2011 12:55:37 +0100
Subject: [PATCH] Rename OpRemoveExport and LURemoveExport
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_backup.py | 2 +-
lib/cmdlib.py | 2 +-
lib/opcodes.py | 2 +-
tools/burnin | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/client/gnt_backup.py b/lib/client/gnt_backup.py
index f0acea940..4d7047b3d 100644
--- a/lib/client/gnt_backup.py
+++ b/lib/client/gnt_backup.py
@@ -107,7 +107,7 @@ def RemoveExport(opts, args):
@return: the desired exit code
"""
- op = opcodes.OpRemoveExport(instance_name=args[0])
+ op = opcodes.OpBackupRemove(instance_name=args[0])
SubmitOpCode(op, opts=opts)
return 0
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 1817c4dd3..d529033ab 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -9869,7 +9869,7 @@ class LUBackupExport(LogicalUnit):
return fin_resu, dresults
-class LURemoveExport(NoHooksLU):
+class LUBackupRemove(NoHooksLU):
"""Remove exports related to the named instance.
"""
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 66744afe8..ee47da7e5 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1146,7 +1146,7 @@ class OpBackupExport(OpCode):
]
-class OpRemoveExport(OpCode):
+class OpBackupRemove(OpCode):
"""Remove an instance's export."""
OP_ID = "OP_BACKUP_REMOVE"
OP_DSC_FIELD = "instance_name"
diff --git a/tools/burnin b/tools/burnin
index 5324ba8b5..5921dc457 100755
--- a/tools/burnin
+++ b/tools/burnin
@@ -740,7 +740,7 @@ class Burner(object):
osparams=self.opts.osparams,
)
- erem_op = opcodes.OpRemoveExport(instance_name=instance)
+ erem_op = opcodes.OpBackupRemove(instance_name=instance)
Log("export to node %s", enode, indent=2)
Log("remove instance", indent=2)
--
GitLab