Add QA test for node group modification of ndparams

Additionally, we run hbal if the htools tests are enabled (new
key). Note that hbal will directly exit, since there are no instances,
but at least it will load and parse the group details.

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

diff --git a/qa/qa-sample.json b/qa/qa-sample.json
index dc033ac..25d061e 100644 (file)
--- a/qa/qa-sample.json
+++ b/qa/qa-sample.json
@@ -96,6 +96,7 @@
     "cluster-repair-disk-sizes": true,
 
     "haskell-confd": true,
+    "htools": true,
 
     "group-list": true,
     "group-rwops": true,

diff --git a/qa/qa_group.py b/qa/qa_group.py
index 2adc620..b72ff02 100644 (file)
--- a/qa/qa_group.py
+++ b/qa/qa_group.py
@@ -1,7 +1,7 @@
 #
 #
 
-# Copyright (C) 2010, 2011 Google Inc.
+# Copyright (C) 2010, 2011, 2012 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -103,6 +103,12 @@ def TestGroupModify():
                    "min=%s,max=%s,std=0" % (min_v, max_v), group1], fail=True)
     AssertCommand(["gnt-group", "modify", "--specs-mem-size",
                    "min=%s,max=%s" % (min_v, max_v), group1])
+    AssertCommand(["gnt-group", "modify",
+                   "--node-parameters", "spindle_count=10", group1])
+    if qa_config.TestEnabled("htools"):
+      AssertCommand(["hbal", "-L", "-G", group1])
+    AssertCommand(["gnt-group", "modify",
+                   "--node-parameters", "spindle_count=default", group1])
   finally:
     AssertCommand(["gnt-group", "remove", group1])