QA: Update tests for new ipolicy specs command-line options

[ganeti-local] / qa / qa_group.py

diff --git a/qa/qa_group.py b/qa/qa_group.py
index e0e4cc7..a25f271 100644 (file)
--- a/qa/qa_group.py
+++ b/qa/qa_group.py
@@ -1,7 +1,7 @@
 #
 #
 
-# Copyright (C) 2010 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
@@ -19,17 +19,33 @@
 # 02110-1301, USA.
 
 
+"""QA tests for node groups.
+
+"""
+
+from ganeti import constants
+from ganeti import query
+from ganeti import utils
+
 import qa_config
-from qa_utils import AssertCommand
+import qa_utils
+
+from qa_utils import AssertCommand, AssertEqual, GetCommandOutput
+
+
+def GetDefaultGroup():
+  """Returns the default node group.
+
+  """
+  groups = qa_config.get("groups", {})
+  return groups.get("group-with-nodes", constants.INITIAL_NODE_GROUP_NAME)
 
 
 def TestGroupAddRemoveRename():
   """gnt-group add/remove/rename"""
-  groups = qa_config.get("groups", {})
+  existing_group_with_nodes = GetDefaultGroup()
 
-  existing_group_with_nodes = groups.get("group-with-nodes", "default")
-  group1, group2, group3 = groups.get("inexistent-groups",
-                                      ["group1", "group2", "group3"])[:3]
+  (group1, group2, group3) = qa_utils.GetNonexistentGroups(3)
 
   AssertCommand(["gnt-group", "add", group1])
   AssertCommand(["gnt-group", "add", group2])
@@ -50,12 +66,116 @@ def TestGroupAddRemoveRename():
     AssertCommand(["gnt-group", "rename", group1, existing_group_with_nodes])
 
 
-def TestGroupListDefaultFields():
+def TestGroupAddWithOptions():
+  """gnt-group add with options"""
+  (group1, ) = qa_utils.GetNonexistentGroups(1)
+
+  AssertCommand(["gnt-group", "add", "--alloc-policy", "notvalid", group1],
+                fail=True)
+
+  AssertCommand(["gnt-group", "add", "--alloc-policy", "last_resort",
+                 "--node-parameters", "oob_program=/bin/true", group1])
+
+  AssertCommand(["gnt-group", "remove", group1])
+
+
+def _TestGroupModifyISpecs(groupname):
+  # Get the ipolicy command (from the cluster config)
+  mnode = qa_config.GetMasterNode()
+  addcmd = GetCommandOutput(mnode.primary, utils.ShellQuoteArgs([
+    "gnt-group", "show-ispecs-cmd", "--include-defaults", groupname,
+    ]))
+  modcmd = ["gnt-group", "modify"]
+  opts = addcmd.split()
+  assert opts[0:2] == ["gnt-group", "add"]
+  for k in range(2, len(opts) - 1):
+    if opts[k].startswith("--ipolicy-"):
+      assert k + 2 <= len(opts)
+      modcmd.extend(opts[k:k + 2])
+  modcmd.append(groupname)
+  # Apply the ipolicy to the group and verify the result
+  AssertCommand(modcmd)
+  new_addcmd = GetCommandOutput(mnode.primary, utils.ShellQuoteArgs([
+    "gnt-group", "show-ispecs-cmd", groupname,
+    ]))
+  AssertEqual(addcmd, new_addcmd)
+
+
+def _TestGroupModifyIPolicy(groupname):
+  _TestGroupModifyISpecs(groupname)
+  AssertCommand(["gnt-group", "modify", "--ipolicy-vcpu-ratio",
+                 "3.5", groupname])
+  AssertCommand(["gnt-group", "modify", "--ipolicy-vcpu-ratio",
+                 "default", groupname])
+
+
+def TestGroupModify():
+  """gnt-group modify"""
+  (group1, ) = qa_utils.GetNonexistentGroups(1)
+
+  AssertCommand(["gnt-group", "add", group1])
+
+  try:
+    _TestGroupModifyIPolicy(group1)
+    AssertCommand(["gnt-group", "modify", "--alloc-policy", "unallocable",
+                   "--node-parameters", "oob_program=/bin/false", group1])
+    AssertCommand(["gnt-group", "modify",
+                   "--alloc-policy", "notvalid", group1], fail=True)
+    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])
+
+
+def TestGroupList():
   """gnt-group list"""
-  AssertCommand(["gnt-group", "list"])
+  qa_utils.GenericQueryTest("gnt-group", query.GROUP_FIELDS.keys())
+
+
+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
+
+  Expects node1 and node2 to be primary and secondary for a common instance.
 
+  """
+  assert node1 != node2
 
-def TestGroupListAllFields():
-  """gnt-group list -o FIELDS"""
-  AssertCommand(["gnt-group", "list", "-o",
-                 "name,uuid,node_cnt,node_list,pinst_cnt,pinst_list"])
+  (other_group, ) = qa_utils.GetNonexistentGroups(1)
+
+  master_node = qa_config.GetMasterNode().primary
+
+  def AssertInGroup(group, nodes):
+    real_output = GetCommandOutput(master_node,
+                                   "gnt-node list --no-headers -o group " +
+                                   utils.ShellQuoteArgs(nodes))
+    AssertEqual(real_output.splitlines(), [group] * len(nodes))
+
+  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])
+
+    # This should fail because moving node1 to orig_group would leave their
+    # common instance split between orig_group and other_group.
+    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])