projects / ganeti-local / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add UnescapeAndSplit unittest for multi-escapes
[ganeti-local] / qa / qa_node.py
diff --git a/qa/qa_node.py b/qa/qa_node.py
index c29f491..cffa969 100644 (file)
--- a/qa/qa_node.py
+++ b/qa/qa_node.py
@@ -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
@@ -19,6 +19,10 @@
 # 02110-1301, USA.
 
 
+"""Node-related QA tests.
+
+"""
+
 from ganeti import utils
 from ganeti import constants
 from ganeti import query
@@ -28,7 +32,7 @@ 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):
@@ -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, []))
@@ -225,13 +242,18 @@ def _AssertOobCall(verify_path, expected_args):
   verify_output_cmd = utils.ShellQuoteArgs(["cat", verify_path])
   output = qa_utils.GetCommandOutput(master["primary"], verify_output_cmd)
 
-  qa_utils.AssertEqual(expected_args, output.strip())
+  AssertEqual(expected_args, output.strip())
 
 
 def TestOutOfBand():
   """gnt-node power"""
   master = qa_config.GetMasterNode()
 
+  node = qa_config.AcquireNode(exclude=master)
+
+  node_name = node["primary"]
+  full_node_name = qa_utils.ResolveNodeName(node)
+
   (oob_path, verify_path,
    data_path, exit_code_path) = _CreateOobScriptStructure()
 
@@ -242,66 +264,82 @@ def TestOutOfBand():
     # No data, exit 0
     _UpdateOobFile(exit_code_path, "0")
 
-    AssertCommand(["gnt-node", "power", "on", master["primary"]])
-    _AssertOobCall(verify_path, "power-on %s" % master["primary"])
+    AssertCommand(["gnt-node", "power", "on", node_name])
+    _AssertOobCall(verify_path, "power-on %s" % full_node_name)
+
+    AssertCommand(["gnt-node", "power", "off", node_name])
+    _AssertOobCall(verify_path, "power-off %s" % full_node_name)
 
-    AssertCommand(["gnt-node", "power", "off", master["primary"]])
-    _AssertOobCall(verify_path, "power-off %s" % master["primary"])
+    # Verify we can't transform back to online when not yet powered on
+    AssertCommand(["gnt-node", "modify", "-O", "no", node_name],
+                  fail=True)
+    # Now reset state
+    AssertCommand(["gnt-node", "modify", "-O", "no", "--node-powered", "yes",
+                   node_name])
 
-    AssertCommand(["gnt-node", "power", "cycle", master["primary"]])
-    _AssertOobCall(verify_path, "power-cycle %s" % master["primary"])
+    AssertCommand(["gnt-node", "power", "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
-    AssertCommand(["gnt-node", "power", "status", master["primary"]],
+    AssertCommand(["gnt-node", "power", "status", node_name],
                   fail=True)
-    _AssertOobCall(verify_path, "power-status %s" % master["primary"])
+    _AssertOobCall(verify_path, "power-status %s" % full_node_name)
 
     # Data, exit 0
     _UpdateOobFile(data_path, serializer.DumpJson({ "powered": True }))
 
-    AssertCommand(["gnt-node", "power", "status", master["primary"]])
-    _AssertOobCall(verify_path, "power-status %s" % master["primary"])
+    AssertCommand(["gnt-node", "power", "status", node_name])
+    _AssertOobCall(verify_path, "power-status %s" % full_node_name)
 
-    AssertCommand(["gnt-node", "power", "on", master["primary"]], fail=True)
-    _AssertOobCall(verify_path, "power-on %s" % master["primary"])
+    AssertCommand(["gnt-node", "power", "on", node_name], fail=True)
+    _AssertOobCall(verify_path, "power-on %s" % full_node_name)
 
-    AssertCommand(["gnt-node", "power", "off", master["primary"]], fail=True)
-    _AssertOobCall(verify_path, "power-off %s" % master["primary"])
+    try:
+      AssertCommand(["gnt-node", "power", "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", master["primary"]], fail=True)
-    _AssertOobCall(verify_path, "power-cycle %s" % master["primary"])
+    AssertCommand(["gnt-node", "power", "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", master["primary"]], fail=True)
-    _AssertOobCall(verify_path, "power-on %s" % master["primary"])
+    AssertCommand(["gnt-node", "power", "on", node_name], fail=True)
+    _AssertOobCall(verify_path, "power-on %s" % full_node_name)
 
-    AssertCommand(["gnt-node", "power", "off", master["primary"]], fail=True)
-    _AssertOobCall(verify_path, "power-off %s" % master["primary"])
+    try:
+      AssertCommand(["gnt-node", "power", "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", master["primary"]], fail=True)
-    _AssertOobCall(verify_path, "power-cycle %s" % master["primary"])
+    AssertCommand(["gnt-node", "power", "cycle", node_name], fail=True)
+    _AssertOobCall(verify_path, "power-cycle %s" % full_node_name)
 
-    AssertCommand(["gnt-node", "power", "status", master["primary"]],
+    AssertCommand(["gnt-node", "power", "status", node_name],
                   fail=True)
-    _AssertOobCall(verify_path, "power-status %s" % master["primary"])
+    _AssertOobCall(verify_path, "power-status %s" % full_node_name)
 
     # No data, exit 1 (all should fail)
     _UpdateOobFile(data_path, "")
-    AssertCommand(["gnt-node", "power", "on", master["primary"]], fail=True)
-    _AssertOobCall(verify_path, "power-on %s" % master["primary"])
+    AssertCommand(["gnt-node", "power", "on", node_name], fail=True)
+    _AssertOobCall(verify_path, "power-on %s" % full_node_name)
 
-    AssertCommand(["gnt-node", "power", "off", master["primary"]], fail=True)
-    _AssertOobCall(verify_path, "power-off %s" % master["primary"])
+    try:
+      AssertCommand(["gnt-node", "power", "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", master["primary"]], fail=True)
-    _AssertOobCall(verify_path, "power-cycle %s" % master["primary"])
+    AssertCommand(["gnt-node", "power", "cycle", node_name], fail=True)
+    _AssertOobCall(verify_path, "power-cycle %s" % full_node_name)
 
-    AssertCommand(["gnt-node", "power", "status", master["primary"]],
+    AssertCommand(["gnt-node", "power", "status", node_name],
                   fail=True)
-    _AssertOobCall(verify_path, "power-status %s" % master["primary"])
+    _AssertOobCall(verify_path, "power-status %s" % full_node_name)
 
     # Different OOB script for node
     verify_path2 = qa_utils.UploadData(master["primary"], "")
@@ -311,16 +349,16 @@ def TestOutOfBand():
 
     try:
       AssertCommand(["gnt-node", "modify", "--node-parameters",
-                     "oob_program=%s" % oob_path2, master["primary"]])
-      AssertCommand(["gnt-node", "power", "on", master["primary"]])
-      _AssertOobCall(verify_path2, "power-on %s" % master["primary"])
+                     "oob_program=%s" % oob_path2, node_name])
+      AssertCommand(["gnt-node", "power", "on", node_name])
+      _AssertOobCall(verify_path2, "power-on %s" % full_node_name)
     finally:
       AssertCommand(["gnt-node", "modify", "--node-parameters",
-                     "oob_program=default", master["primary"]])
+                     "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])
 
Unnamed repository; edit this file 'description' to name the repository.