On 30 January 2013 13:16, Michael Hanselmann <[email protected]> wrote:
> 2013/1/30 Bernardo Dal Seno <[email protected]>:
>> --- a/qa/qa_instance.py
>> +++ b/qa/qa_instance.py
>> + qa_config.SetInstanceTemplate(newinst, "plain")
>
> Shouldn't this be constants.DT_PLAIN?
It's better. Updated the other occurrence in the same function. Interdiff:
diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index 195457b..9dab9da 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -632,8 +632,9 @@ def TestInstanceExportNoTarget(instance):
@InstanceCheck(None, INST_DOWN, FIRST_ARG)
def TestInstanceImport(newinst, node, expnode, name):
"""gnt-backup import"""
+ templ = constants.DT_PLAIN
cmd = (["gnt-backup", "import",
- "--disk-template=plain",
+ "--disk-template=%s" % templ,
"--no-ip-check",
"--src-node=%s" % expnode["primary"],
"--src-dir=%s/%s" % (pathutils.EXPORT_DIR, name),
@@ -641,7 +642,7 @@ def TestInstanceImport(newinst, node, expnode, name):
_GetGenericAddParameters(newinst, force_mac=constants.VALUE_GENERATE))
cmd.append(newinst["name"])
AssertCommand(cmd)
- qa_config.SetInstanceTemplate(newinst, "plain")
+ qa_config.SetInstanceTemplate(newinst, templ)
def TestBackupList(expnode):
Bernardo
