QA: test using OS API v20
authorIustin Pop <iustin@google.com>
Tue, 26 Jul 2011 17:11:28 +0000 (19:11 +0200)
committerIustin Pop <iustin@google.com>
Wed, 27 Jul 2011 08:38:59 +0000 (10:38 +0200)
v20 is (mostly) a superset of the other versions, so testing with it
should be better than with V10. This detects properly the breakage
fixed by the previous patch.

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

qa/qa_os.py

index 5868a39..6910083 100644 (file)
@@ -86,19 +86,25 @@ def _SetupTempOs(node, dirname, valid):
 
   """
   sq = utils.ShellQuoteArgs
-  parts = [sq(["rm", "-rf", dirname]),
-           sq(["mkdir", "-p", dirname]),
-           sq(["cd", dirname]),
-           sq(["ln", "-fs", "/bin/true", "export"]),
-           sq(["ln", "-fs", "/bin/true", "import"]),
-           sq(["ln", "-fs", "/bin/true", "rename"])]
+  parts = [
+    sq(["rm", "-rf", dirname]),
+    sq(["mkdir", "-p", dirname]),
+    sq(["cd", dirname]),
+    sq(["ln", "-fs", "/bin/true", "export"]),
+    sq(["ln", "-fs", "/bin/true", "import"]),
+    sq(["ln", "-fs", "/bin/true", "rename"]),
+    sq(["ln", "-fs", "/bin/true", "verify"]),
+    ]
 
   if valid:
     parts.append(sq(["ln", "-fs", "/bin/true", "create"]))
 
-  parts.append(sq(["echo", str(constants.OS_API_V10)]) +
+  parts.append(sq(["echo", str(constants.OS_API_V20)]) +
                " >ganeti_api_version")
 
+  parts.append(sq(["echo", "default"]) + " >variants.list")
+  parts.append(sq(["echo", "funny this is funny"]) + " >parameters.list")
+
   cmd = " && ".join(parts)
 
   print qa_utils.FormatInfo("Setting up %s with %s OS definition" %