[PATCH master 6/6] Add QA tests for OpAssignGroupNodes

[Adeodato Simo]

Signed-off-by: Adeodato Simo <d...@google.com>
---
 qa/ganeti-qa.py |    4 ++++
 qa/qa_group.py  |   37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index ffb4b80..ed56dec 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -41,6 +41,7 @@ import qa_utils
 
 from ganeti import utils
 from ganeti import rapi
+from ganeti import constants
 
 import ganeti.rapi.client
 
@@ -437,6 +438,9 @@ def main():
           instance = RunTest(func, pnode, snode)
           RunCommonInstanceTests(instance)
           RunGroupListTests()
+          RunTest(qa_group.TestAssignNodesIncludingSplit,
+                  constants.INITIAL_NODE_GROUP_NAME,
+                  pnode["primary"], snode["primary"])
           if qa_config.TestEnabled('instance-convert-disk'):
             RunTest(qa_instance.TestInstanceShutdown, instance)
             RunTest(qa_instance.TestInstanceConvertDisk, instance, snode)
diff --git a/qa/qa_group.py b/qa/qa_group.py
index 891531e..b61b983 100644
--- a/qa/qa_group.py
+++ b/qa/qa_group.py
@@ -21,11 +21,12 @@
 
 from ganeti import constants
 from ganeti import query
+from ganeti import utils
 
 import qa_config
 import qa_utils
 
-from qa_utils import AssertCommand
+from qa_utils import AssertCommand, AssertEqual, GetCommandOutput
 
 
 def TestGroupAddRemoveRename():
@@ -94,3 +95,37 @@ def TestGroupList():
 def TestGroupListFields():
   """gnt-group list-fields"""
   qa_utils.GenericQueryFieldsTest("gnt-group", query.GROUP_FIELDS.keys())
+
+
+def TestAssignNodesIncludingSplit(orig_group, node1, node2):
+  """gnt-group assign-nodes --force"""
+  groups = qa_config.get("groups", {})
+  other_group = groups.get("inexistent-groups", ["group1"])[0]
+
+  master_node = qa_config.GetMasterNode()["primary"]
+
+  def AssertInGroup(group, nodes):
+    expected_output = (group + "\n") * len(nodes)
+    real_output = GetCommandOutput(master_node,
+                                   "gnt-node list --no-headers -o group " +
+                                   utils.ShellQuoteArgs(nodes))
+    AssertEqual(expected_output, real_output)
+
+  AssertInGroup(orig_group, [node1, node2])
+  AssertCommand(["gnt-group", "add", other_group])
+
+  try:
+    AssertCommand(["gnt-group", "assign-nodes", other_group, node1, node2])
+    AssertInGroup(other_group, [node1, node2])
+
+    AssertCommand(["gnt-group", "assign-nodes", orig_group, node1], fail=True)
+    AssertInGroup(other_group, [node1, node2])
+
+    AssertCommand(["gnt-group", "assign-nodes", "--force", orig_group, node1])
+    AssertInGroup(orig_group, [node1])
+    AssertInGroup(other_group, [node2])
+
+    AssertCommand(["gnt-group", "assign-nodes", orig_group, node2])
+    AssertInGroup(orig_group, [node1, node2])
+  finally:
+    AssertCommand(["gnt-group", "remove", other_group])
-- 
1.7.3.1