Rename OpRemoveExport and LURemoveExport

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

diff --git a/lib/client/gnt_backup.py b/lib/client/gnt_backup.py
index f0acea9..4d7047b 100644 (file)
--- 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 1817c4d..d529033 100644 (file)
--- 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 66744af..ee47da7 100644 (file)
--- 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 5324ba8..5921dc4 100755 (executable)
--- 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)