On 30 January 2013 18:20, Michael Hanselmann <[email protected]> wrote:
> 2013/1/30 Bernardo Dal Seno <[email protected]>:
>> +def TestExclStorSharedPv(node):
>> + AssertCommand(["lvcreate", "-L1G", "-nqa-vol0", "xenvg"], node=node_name)
>
> Please don't use hardcoded names. Either make them at least constants
> or even configurable. That said:
Ok, see interdiff below.
> qa_cluster.py: (False, ["lvcreate", "-L1G", "-nqa-test", "xenvg"]),
>
> Please fix, too. :-)
This is patch 5.5/17.
Interdiff:
diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index f2868d9..1fb1848 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -680,12 +680,15 @@ def TestExclStorSharedPv(node):
"""cluster-verify reports LVs that share the same PV with exclusive_storage.
"""
+ vgname = qa_config.get("vg-name", constants.DEFAULT_VG)
+ lvname1 = _QA_LV_PREFIX + "vol1"
+ lvname2 = _QA_LV_PREFIX + "vol2"
node_name = node["primary"]
- AssertCommand(["lvcreate", "-L1G", "-nqa-vol0", "xenvg"], node=node_name)
+ AssertCommand(["lvcreate", "-L1G", "-n", lvname1, vgname], node=node_name)
AssertClusterVerify(fail=True, errors=[constants.CV_ENODEORPHANLV])
- AssertCommand(["lvcreate", "-L1G", "-nqa-vol1", "xenvg"], node=node_name)
+ AssertCommand(["lvcreate", "-L1G", "-n", lvname2, vgname], node=node_name)
AssertClusterVerify(fail=True, errors=[constants.CV_ENODELVM,
constants.CV_ENODEORPHANLV])
- AssertCommand(["lvremove", "-f", "xenvg/qa-vol0"], node=node_name)
- AssertCommand(["lvremove", "-f", "xenvg/qa-vol1"], node=node_name)
+ AssertCommand(["lvremove", "-f", "/".join([vgname, lvname1])],
node=node_name)
+ AssertCommand(["lvremove", "-f", "/".join([vgname, lvname2])],
node=node_name)
AssertClusterVerify()
Bernardo
