QA: remove the --default-hypervisor option

This option is gone since 1ac0f5e6d2f06a5bf12815e1b92d1338af32833c,
fixing the QA suite to deal with this.

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index e5d4980..d2a18be 100644 (file)
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -1,7 +1,7 @@
 {
   "name": "xen-test",
   "rename": "xen-test-rename",
-  "default-hypervisor": "xen-pvm",
+  "enabled-hypervisors": "xen-pvm",
 
   "os": "debian-etch",
   "mem": "512M",

diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 4d10c8f..6f7d5ab 100644 (file)
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -68,9 +68,9 @@ def TestClusterInit():
     cmd.append('--bridge=%s' % bridge)
     cmd.append('--master-netdev=%s' % bridge)
 
-  htype = qa_config.get('default-hypervisor', None)
+  htype = qa_config.get('enabled-hypervisors', None)
   if htype:
-    cmd.append('--default-hypervisor=%s' % htype)
+    cmd.append('--enabled-hypervisors=%s' % htype)
 
   cmd.append(qa_config.get('name'))