X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/288d6440828eb65f23e3e95dfd8915d7392ba8a2..286b73359bc49b14224c8ef7bfc4e48737640c1f:/qa/qa-sample.json

diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index 8c42c30..dc033ac 100644
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -2,15 +2,34 @@
   "name": "xen-test",
   "rename": "xen-test-rename",
   "enabled-hypervisors": "xen-pvm",
+  "# Dict of hypervisor name and parameters (like on the cmd line)": null,
+  "hypervisor-parameters": {},
+  "# Backend parameters (like on the cmd line)": null,
+  "backend-parameters": "",
+  "# Dict of OS name and parameters (like on the cmd line)": null,
+  "os-parameters": {},
+  "# Dict of OS name and value dict of hypervisor  parameters": null,
+  "os-hvp": {},
   "primary_ip_version": 4,
 
   "os": "debian-etch",
-  "mem": "512M",
+  "maxmem": "1024M",
+  "minmem": "512M",
+
+  "# Instance policy specs": null,
+  "ispec_mem_size_max": 1024,
+  "ispec_disk_size_min": 512,
 
   "# Lists of disk sizes": null,
   "disk": ["1G", "512M"],
   "disk-growth": ["2G", "768M"],
 
+  "# Script to check instance status": null,
+  "instance-check": null,
+
+  "# Regular expression to ignore existing tags": null,
+  "ignore-tags-re": null,
+
   "nodes": [
     {
       "# Master node": null,
@@ -26,10 +45,16 @@
 
   "instances": [
     {
-      "name": "xen-test-inst1"
+      "name": "xen-test-inst1",
+
+      "# Static MAC address": null,
+      "#nic.mac/0": "AA:00:00:11:11:11"
     },
     {
-      "name": "xen-test-inst2"
+      "name": "xen-test-inst2",
+
+      "# Static MAC address": null,
+      "#nic.mac/0": "AA:00:00:22:22:22"
     }
   ],
 
@@ -40,14 +65,18 @@
       "group2",
       "group3"
     ]
-  }
+  },
 
   "tests": {
+    "# Whether tests are enabled or disabled by default": null,
+    "default": true,
+
     "env": true,
     "os": true,
     "tags": true,
     "rapi": true,
     "test-jobqueue": true,
+    "delay": true,
 
     "create-cluster": true,
     "cluster-verify": true,
@@ -61,6 +90,12 @@
     "cluster-rename": true,
     "cluster-reserved-lvs": true,
     "cluster-modify": true,
+    "cluster-oob": true,
+    "cluster-epo": true,
+    "cluster-redist-conf": true,
+    "cluster-repair-disk-sizes": true,
+
+    "haskell-confd": true,
 
     "group-list": true,
     "group-rwops": true,
@@ -71,6 +106,7 @@
     "node-readd": true,
     "node-storage": true,
     "node-modify": true,
+    "node-oob": true,
 
     "# This test needs at least three nodes": null,
     "node-evacuate": false,
@@ -81,9 +117,12 @@
     "instance-add-plain-disk": true,
     "instance-add-drbd-disk": true,
     "instance-convert-disk": true,
+    "instance-plain-rapi-common-tests": true,
+    "instance-remove-drbd-offline": true,
 
     "instance-export": true,
     "instance-failover": true,
+    "instance-grow-disk": true,
     "instance-import": true,
     "instance-info": true,
     "instance-list": true,
@@ -94,6 +133,8 @@
     "instance-rename": true,
     "instance-shutdown": true,
 
+    "job-list": true,
+
     "# cron/ganeti-watcher should be disabled for these tests": null,
     "instance-automatic-restart": false,
     "instance-consecutive-failures": false,