Fix type check for OpQuery.filter
[ganeti-local] / qa / qa_node.py
index 47d7c88..8b2d406 100644 (file)
@@ -1,7 +1,7 @@
 #
 #
 
-# Copyright (C) 2007 Google Inc.
+# Copyright (C) 2007, 2011 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
 # 02110-1301, USA.
 
 
+"""Node-related QA tests.
+
+"""
+
 from ganeti import utils
 from ganeti import constants
 from ganeti import query
@@ -28,36 +32,36 @@ import qa_config
 import qa_error
 import qa_utils
 
-from qa_utils import AssertCommand
+from qa_utils import AssertCommand, AssertEqual
 
 
 def _NodeAdd(node, readd=False):
-  if not readd and node.get('_added', False):
-    raise qa_error.Error("Node %s already in cluster" % node['primary'])
-  elif readd and not node.get('_added', False):
-    raise qa_error.Error("Node %s not yet in cluster" % node['primary'])
-
-  cmd = ['gnt-node', 'add', "--no-ssh-key-check"]
-  if node.get('secondary', None):
-    cmd.append('--secondary-ip=%s' % node['secondary'])
+  if not readd and node.get("_added", False):
+    raise qa_error.Error("Node %s already in cluster" % node["primary"])
+  elif readd and not node.get("_added", False):
+    raise qa_error.Error("Node %s not yet in cluster" % node["primary"])
+
+  cmd = ["gnt-node", "add", "--no-ssh-key-check"]
+  if node.get("secondary", None):
+    cmd.append("--secondary-ip=%s" % node["secondary"])
   if readd:
-    cmd.append('--readd')
-  cmd.append(node['primary'])
+    cmd.append("--readd")
+  cmd.append(node["primary"])
 
   AssertCommand(cmd)
 
-  node['_added'] = True
+  node["_added"] = True
 
 
 def _NodeRemove(node):
   AssertCommand(["gnt-node", "remove", node["primary"]])
-  node['_added'] = False
+  node["_added"] = False
 
 
 def TestNodeAddAll():
   """Adding all nodes to cluster."""
   master = qa_config.GetMasterNode()
-  for node in qa_config.get('nodes'):
+  for node in qa_config.get("nodes"):
     if node != master:
       _NodeAdd(node, readd=False)
 
@@ -69,15 +73,15 @@ def MarkNodeAddedAll():
 
   """
   master = qa_config.GetMasterNode()
-  for node in qa_config.get('nodes'):
+  for node in qa_config.get("nodes"):
     if node != master:
-      node['_added'] = True
+      node["_added"] = True
 
 
 def TestNodeRemoveAll():
   """Removing all nodes from cluster."""
   master = qa_config.GetMasterNode()
-  for node in qa_config.get('nodes'):
+  for node in qa_config.get("nodes"):
     if node != master:
       _NodeRemove(node)
 
@@ -141,6 +145,19 @@ def TestNodeStorage():
         AssertCommand(["gnt-node", "modify-storage", "--allocatable", i,
                        node_name, storage_type, st_name], fail=fail)
 
+        # Verify list output
+        cmd = ["gnt-node", "list-storage", "--storage-type", storage_type,
+               "--output=name,allocatable", "--separator=|",
+               "--no-headers", node_name]
+        listout = qa_utils.GetCommandOutput(master["primary"],
+                                            utils.ShellQuoteArgs(cmd))
+        for line in listout.splitlines():
+          (vfy_name, vfy_allocatable) = line.split("|")
+          if vfy_name == st_name and not fail:
+            AssertEqual(vfy_allocatable, i[0].upper())
+          else:
+            AssertEqual(vfy_allocatable, st_allocatable)
+
       # Test repair functionality
       fail = (constants.SO_FIX_CONSISTENCY not in
               constants.VALID_STORAGE_OPERATIONS.get(storage_type, []))
@@ -223,20 +240,21 @@ def _AssertOobCall(verify_path, expected_args):
   master = qa_config.GetMasterNode()
 
   verify_output_cmd = utils.ShellQuoteArgs(["cat", verify_path])
-  output = qa_utils.GetCommandOutput(master["primary"], verify_output_cmd)
+  output = qa_utils.GetCommandOutput(master["primary"], verify_output_cmd,
+                                     tty=False)
 
-  qa_utils.AssertEqual(expected_args, output.strip())
+  AssertEqual(expected_args, output.strip())
 
 
 def TestOutOfBand():
   """gnt-node power"""
   master = qa_config.GetMasterNode()
 
-  # Find first non master node for tests
-  for node in qa_config.get('nodes'):
-    if node != master:
-      node_name = node["primary"]
-      break
+  node = qa_config.AcquireNode(exclude=master)
+
+  master_name = master["primary"]
+  node_name = node["primary"]
+  full_node_name = qa_utils.ResolveNodeName(node)
 
   (oob_path, verify_path,
    data_path, exit_code_path) = _CreateOobScriptStructure()
@@ -249,10 +267,17 @@ def TestOutOfBand():
     _UpdateOobFile(exit_code_path, "0")
 
     AssertCommand(["gnt-node", "power", "on", node_name])
-    _AssertOobCall(verify_path, "power-on %s" % node_name)
+    _AssertOobCall(verify_path, "power-on %s" % full_node_name)
 
-    AssertCommand(["gnt-node", "power", "off", node_name])
-    _AssertOobCall(verify_path, "power-off %s" % node_name)
+    AssertCommand(["gnt-node", "power", "-f", "off", node_name])
+    _AssertOobCall(verify_path, "power-off %s" % full_node_name)
+
+    # Power off on master without options should fail
+    AssertCommand(["gnt-node", "power", "-f", "off", master_name], fail=True)
+    # With force master it should still fail
+    AssertCommand(["gnt-node", "power", "-f", "--ignore-status", "off",
+                   master_name],
+                  fail=True)
 
     # Verify we can't transform back to online when not yet powered on
     AssertCommand(["gnt-node", "modify", "-O", "no", node_name],
@@ -261,69 +286,96 @@ def TestOutOfBand():
     AssertCommand(["gnt-node", "modify", "-O", "no", "--node-powered", "yes",
                    node_name])
 
-    AssertCommand(["gnt-node", "power", "cycle", node_name])
-    _AssertOobCall(verify_path, "power-cycle %s" % node_name)
+    AssertCommand(["gnt-node", "power", "-f", "cycle", node_name])
+    _AssertOobCall(verify_path, "power-cycle %s" % full_node_name)
 
-    # This command should fail as it expects output which isn't provided yet
-    # But it should have called the oob helper nevermind
+    # Those commands should fail as they expect output which isn't provided yet
+    # But they should have called the oob helper nevermind
     AssertCommand(["gnt-node", "power", "status", node_name],
                   fail=True)
-    _AssertOobCall(verify_path, "power-status %s" % node_name)
+    _AssertOobCall(verify_path, "power-status %s" % full_node_name)
+
+    AssertCommand(["gnt-node", "health", node_name],
+                  fail=True)
+    _AssertOobCall(verify_path, "health %s" % full_node_name)
+
+    AssertCommand(["gnt-node", "health"], fail=True)
 
-    # Data, exit 0
-    _UpdateOobFile(data_path, serializer.DumpJson({ "powered": True }))
+    # Correct Data, exit 0
+    _UpdateOobFile(data_path, serializer.DumpJson({"powered": True}))
 
     AssertCommand(["gnt-node", "power", "status", node_name])
-    _AssertOobCall(verify_path, "power-status %s" % node_name)
+    _AssertOobCall(verify_path, "power-status %s" % full_node_name)
 
+    _UpdateOobFile(data_path, serializer.DumpJson([["temp", "OK"],
+                                                   ["disk0", "CRITICAL"]]))
+
+    AssertCommand(["gnt-node", "health", node_name])
+    _AssertOobCall(verify_path, "health %s" % full_node_name)
+
+    AssertCommand(["gnt-node", "health"])
+
+    # Those commands should fail as they expect no data regardless of exit 0
     AssertCommand(["gnt-node", "power", "on", node_name], fail=True)
-    _AssertOobCall(verify_path, "power-on %s" % node_name)
+    _AssertOobCall(verify_path, "power-on %s" % full_node_name)
 
     try:
-      AssertCommand(["gnt-node", "power", "off", node_name], fail=True)
-      _AssertOobCall(verify_path, "power-off %s" % node_name)
+      AssertCommand(["gnt-node", "power", "-f", "off", node_name], fail=True)
+      _AssertOobCall(verify_path, "power-off %s" % full_node_name)
     finally:
       AssertCommand(["gnt-node", "modify", "-O", "no", node_name])
 
-    AssertCommand(["gnt-node", "power", "cycle", node_name], fail=True)
-    _AssertOobCall(verify_path, "power-cycle %s" % node_name)
+    AssertCommand(["gnt-node", "power", "-f", "cycle", node_name], fail=True)
+    _AssertOobCall(verify_path, "power-cycle %s" % full_node_name)
 
     # Data, exit 1 (all should fail)
     _UpdateOobFile(exit_code_path, "1")
 
     AssertCommand(["gnt-node", "power", "on", node_name], fail=True)
-    _AssertOobCall(verify_path, "power-on %s" % node_name)
+    _AssertOobCall(verify_path, "power-on %s" % full_node_name)
 
     try:
-      AssertCommand(["gnt-node", "power", "off", node_name], fail=True)
-      _AssertOobCall(verify_path, "power-off %s" % node_name)
+      AssertCommand(["gnt-node", "power", "-f", "off", node_name], fail=True)
+      _AssertOobCall(verify_path, "power-off %s" % full_node_name)
     finally:
       AssertCommand(["gnt-node", "modify", "-O", "no", node_name])
 
-    AssertCommand(["gnt-node", "power", "cycle", node_name], fail=True)
-    _AssertOobCall(verify_path, "power-cycle %s" % node_name)
+    AssertCommand(["gnt-node", "power", "-f", "cycle", node_name], fail=True)
+    _AssertOobCall(verify_path, "power-cycle %s" % full_node_name)
 
     AssertCommand(["gnt-node", "power", "status", node_name],
                   fail=True)
-    _AssertOobCall(verify_path, "power-status %s" % node_name)
+    _AssertOobCall(verify_path, "power-status %s" % full_node_name)
+
+    AssertCommand(["gnt-node", "health", node_name],
+                  fail=True)
+    _AssertOobCall(verify_path, "health %s" % full_node_name)
+
+    AssertCommand(["gnt-node", "health"], fail=True)
 
     # No data, exit 1 (all should fail)
     _UpdateOobFile(data_path, "")
     AssertCommand(["gnt-node", "power", "on", node_name], fail=True)
-    _AssertOobCall(verify_path, "power-on %s" % node_name)
+    _AssertOobCall(verify_path, "power-on %s" % full_node_name)
 
     try:
-      AssertCommand(["gnt-node", "power", "off", node_name], fail=True)
-      _AssertOobCall(verify_path, "power-off %s" % node_name)
+      AssertCommand(["gnt-node", "power", "-f", "off", node_name], fail=True)
+      _AssertOobCall(verify_path, "power-off %s" % full_node_name)
     finally:
       AssertCommand(["gnt-node", "modify", "-O", "no", node_name])
 
-    AssertCommand(["gnt-node", "power", "cycle", node_name], fail=True)
-    _AssertOobCall(verify_path, "power-cycle %s" % node_name)
+    AssertCommand(["gnt-node", "power", "-f", "cycle", node_name], fail=True)
+    _AssertOobCall(verify_path, "power-cycle %s" % full_node_name)
 
     AssertCommand(["gnt-node", "power", "status", node_name],
                   fail=True)
-    _AssertOobCall(verify_path, "power-status %s" % node_name)
+    _AssertOobCall(verify_path, "power-status %s" % full_node_name)
+
+    AssertCommand(["gnt-node", "health", node_name],
+                  fail=True)
+    _AssertOobCall(verify_path, "health %s" % full_node_name)
+
+    AssertCommand(["gnt-node", "health"], fail=True)
 
     # Different OOB script for node
     verify_path2 = qa_utils.UploadData(master["primary"], "")
@@ -335,14 +387,14 @@ def TestOutOfBand():
       AssertCommand(["gnt-node", "modify", "--node-parameters",
                      "oob_program=%s" % oob_path2, node_name])
       AssertCommand(["gnt-node", "power", "on", node_name])
-      _AssertOobCall(verify_path2, "power-on %s" % node_name)
+      _AssertOobCall(verify_path2, "power-on %s" % full_node_name)
     finally:
       AssertCommand(["gnt-node", "modify", "--node-parameters",
                      "oob_program=default", node_name])
       AssertCommand(["rm", "-f", oob_path2, verify_path2])
   finally:
     AssertCommand(["gnt-cluster", "modify", "--node-parameters",
-                   "oob_program=default"])
+                   "oob_program="])
     AssertCommand(["rm", "-f", oob_path, verify_path, data_path,
                    exit_code_path])