Rename OpPrepareExport and LUPrepareExport

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

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index dd0ef80..361dc30 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -9530,7 +9530,7 @@ class LUQueryExports(NoHooksLU):
     return result
 
 
-class LUPrepareExport(NoHooksLU):
+class LUBackupPrepare(NoHooksLU):
   """Prepares an instance for an export and returns useful information.
 
   """

diff --git a/lib/opcodes.py b/lib/opcodes.py
index 6d93773..e72dfba 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -1098,7 +1098,7 @@ class OpQueryExports(OpCode):
     ]
 
 
-class OpPrepareExport(OpCode):
+class OpBackupPrepare(OpCode):
   """Prepares an instance export.
 
   @ivar instance_name: Instance name

diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index a4747b2..a0311bf 100644 (file)
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -1154,7 +1154,7 @@ class R_2_instances_name_prepare_export(baserlib.R_Generic):
     instance_name = self.items[0]
     mode = self._checkStringVariable("mode")
 
-    op = opcodes.OpPrepareExport(instance_name=instance_name,
+    op = opcodes.OpBackupPrepare(instance_name=instance_name,
                                  mode=mode)
 
     return baserlib.SubmitJob([op])

diff --git a/qa/qa_rapi.py b/qa/qa_rapi.py
index ece1b1a..b3edeb4 100644 (file)
--- a/qa/qa_rapi.py
+++ b/qa/qa_rapi.py
@@ -246,7 +246,7 @@ def TestInstance(instance):
      _VerifyReturnsJob, 'PUT', None),
     ])
 
-  # Test OpPrepareExport
+  # Test OpBackupPrepare
   (job_id, ) = _DoTests([
     ("/2/instances/%s/prepare-export?mode=%s" %
      (instance["name"], constants.EXPORT_MODE_REMOTE),