gnt-cluster verify: consider shared file storage

[ganeti-local] / qa / qa-sample.json

diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index e598e9f..8ec6614 100644 (file)
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -5,7 +5,14 @@
   "# sign (#).": null,
 
   "name": "xen-test",
+
+  "# Name used for renaming cluster": null,
   "rename": "xen-test-rename",
+
+  "# Virtual cluster": null,
+  "#vcluster-master": "xen-vcluster",
+  "#vcluster-basedir": "/srv/ganeti/vcluster",
+
   "enabled-hypervisors": "xen-pvm",
   "# Dict of hypervisor name and parameters (like on the cmd line)": null,
   "hypervisor-parameters": {},
@@ -16,6 +23,23 @@
   "# Dict of OS name and value dict of hypervisor  parameters": null,
   "os-hvp": {},
   "primary_ip_version": 4,
+  "# Name of the LVM group for the cluster": null,
+  "vg-name": "xenvg",
+  "# Cluster-level value of the exclusive-storage flag": null,
+  "exclusive-storage": null,
+
+  "# Only enable disk templates that the QA machines can actually use.": null,
+  "enabled-disk-templates": [
+    "plain",
+    "drbd",
+    "diskless"
+  ],
+
+  "# Default file storage dir (used also for shared storage)": null,
+  "default-file-storage-dir": "/srv/ganeti/file-storage",
+
+  "# Additional arguments for initializing cluster": null,
+  "cluster-init-args": [],
 
   "# Network interface for master role": null,
   "#master-netdev": "xen-br0",
@@ -23,7 +47,7 @@
   "# Default network interface parameters": null,
   "#default-nicparams": {
     "mode": "bridged",
-    "link": "xen-br0",
+    "link": "xen-br0"
   },
 
   "os": "debian-etch",
@@ -31,12 +55,39 @@
   "minmem": "512M",
 
   "# Instance policy specs": null,
-  "ispec_mem_size_max": 1024,
+  "#ispec_cpu_count_max": null,
+  "#ispec_cpu_count_min": null,
+  "#ispec_cpu_count_std": null,
+  "#ispec_disk_count_max": null,
+  "#ispec_disk_count_min": null,
+  "#ispec_disk_count_std": null,
+  "#ispec_disk_size_max": null,
   "ispec_disk_size_min": 512,
-
-  "# Lists of disk sizes": null,
-  "disk": ["1G", "512M"],
-  "disk-growth": ["2G", "768M"],
+  "#ispec_disk_size_std": null,
+  "ispec_mem_size_max": 1024,
+  "#ispec_mem_size_min": null,
+  "#ispec_mem_size_std": null,
+  "#ispec_nic_count_max": null,
+  "#ispec_nic_count_min": null,
+  "#ispec_nic_count_std": null,
+
+  "# Lists of disks": null,
+  "disks": [
+    {
+      "size": "1G",
+      "spindles": 2,
+      "name": "disk0",
+      "growth": "2G",
+      "spindles-growth": 1
+    },
+    {
+      "size": "512M",
+      "spindles": 1,
+      "name": "disk1",
+      "growth": "768M",
+      "spindles-growth": 0
+    }
+  ],
 
   "# Script to check instance status": null,
   "instance-check": null,
@@ -81,6 +132,14 @@
     ]
   },
 
+  "networks": {
+    "inexistent-networks": [
+      "network1",
+      "network2",
+      "network3"
+    ]
+  },
+
   "tests": {
     "# Whether tests are enabled or disabled by default": null,
     "default": true,
@@ -108,6 +167,8 @@
     "cluster-epo": true,
     "cluster-redist-conf": true,
     "cluster-repair-disk-sizes": true,
+    "cluster-exclusive-storage": true,
+    "cluster-instance-policy": true,
 
     "haskell-confd": true,
     "htools": true,
@@ -115,6 +176,8 @@
     "group-list": true,
     "group-rwops": true,
 
+    "network": false,
+
     "node-list": true,
     "node-info": true,
     "node-volumes": true,
@@ -123,14 +186,19 @@
     "node-modify": true,
     "node-oob": true,
 
-    "# This test needs at least three nodes": null,
+    "# These tests need at least three nodes": null,
     "node-evacuate": false,
+    "node-migrate": false,
 
     "# This test needs at least two nodes": null,
     "node-failover": false,
 
     "instance-add-plain-disk": true,
+    "instance-add-file": true,
+    "instance-add-shared-file": true,
     "instance-add-drbd-disk": true,
+    "instance-add-diskless": true,
+    "instance-add-restricted-by-disktemplates": true,
     "instance-convert-disk": true,
     "instance-plain-rapi-common-tests": true,
     "instance-remove-drbd-offline": true,
@@ -143,10 +211,13 @@
     "instance-list": true,
     "instance-migrate": true,
     "instance-modify": true,
+    "instance-modify-primary": true,
+    "instance-modify-disks": false,
     "instance-reboot": true,
     "instance-reinstall": true,
     "instance-rename": true,
     "instance-shutdown": true,
+    "instance-device-names": true,
 
     "job-list": true,
 
@@ -165,10 +236,11 @@
     "# Whether to test the tools/move-instance utility": null,
     "inter-cluster-instance-move": false,
 
-    "# Make sure not to include the disk(s) required for Dom0 to be up": null,
-    "# in the volume group used for instances. Otherwise the whole": null,
-    "# system may stop working until restarted.": null,
-    "instance-disk-failure": false
+    "# Run instance tests with different cluster configurations": null,
+    "default-instance-tests": true,
+    "exclusive-storage-instance-tests": false,
+
+    "mon-collector": true
   },
 
   "options": {