From 71910715d49828acf8cc89d59ed2303c01b44b30 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sat, 15 Jan 2011 12:55:30 +0100
Subject: [PATCH] Rename OpPrepareExport and LUPrepareExport
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/cmdlib.py | 2 +-
lib/opcodes.py | 2 +-
lib/rapi/rlib2.py | 2 +-
qa/qa_rapi.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index dd0ef806d..361dc3030 100644
--- 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 6d9377314..e72dfba00 100644
--- 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 a4747b2ae..a0311bf3f 100644
--- 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 ece1b1a10..b3edeb4e3 100644
--- 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),
--
GitLab