X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/a07247721fd9c2c5dfa6cd840db7b4ac647e4c58..d4e297b88c3402c099bbc093a31716a0d1519564:/qa/qa_node.py diff --git a/qa/qa_node.py b/qa/qa_node.py index 30e5853..647af19 100644 --- a/qa/qa_node.py +++ b/qa/qa_node.py @@ -1,7 +1,7 @@ # # -# Copyright (C) 2007, 2011 Google Inc. +# Copyright (C) 2007, 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 @@ -36,32 +36,38 @@ 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 MakeNodeOffline(node, value): + """gnt-node modify --offline=value""" + # value in ["yes", "no"] + AssertCommand(["gnt-node", "modify", "--offline", value, node["primary"]]) 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) @@ -73,15 +79,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) @@ -209,6 +215,10 @@ def TestNodeModify(node): AssertCommand(["gnt-node", "modify", "--master-candidate=yes", "--auto-promote", node["primary"]]) + # Test setting secondary IP address + AssertCommand(["gnt-node", "modify", "--secondary-ip=%s" % node["secondary"], + node["primary"]]) + def _CreateOobScriptStructure(): """Create a simple OOB handling script and its structure.""" @@ -240,7 +250,8 @@ 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) AssertEqual(expected_args, output.strip()) @@ -251,6 +262,7 @@ def TestOutOfBand(): node = qa_config.AcquireNode(exclude=master) + master_name = master["primary"] node_name = node["primary"] full_node_name = qa_utils.ResolveNodeName(node) @@ -267,9 +279,16 @@ def TestOutOfBand(): AssertCommand(["gnt-node", "power", "on", node_name]) _AssertOobCall(verify_path, "power-on %s" % full_node_name) - AssertCommand(["gnt-node", "power", "off", 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], fail=True) @@ -277,7 +296,7 @@ def TestOutOfBand(): AssertCommand(["gnt-node", "modify", "-O", "no", "--node-powered", "yes", node_name]) - AssertCommand(["gnt-node", "power", "cycle", node_name]) + AssertCommand(["gnt-node", "power", "-f", "cycle", node_name]) _AssertOobCall(verify_path, "power-cycle %s" % full_node_name) # Those commands should fail as they expect output which isn't provided yet @@ -293,7 +312,7 @@ def TestOutOfBand(): AssertCommand(["gnt-node", "health"], fail=True) # Correct Data, exit 0 - _UpdateOobFile(data_path, serializer.DumpJson({ "powered": True })) + _UpdateOobFile(data_path, serializer.DumpJson({"powered": True})) AssertCommand(["gnt-node", "power", "status", node_name]) _AssertOobCall(verify_path, "power-status %s" % full_node_name) @@ -306,18 +325,17 @@ def TestOutOfBand(): 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" % full_node_name) try: - AssertCommand(["gnt-node", "power", "off", node_name], fail=True) + 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) + 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) @@ -327,12 +345,12 @@ def TestOutOfBand(): _AssertOobCall(verify_path, "power-on %s" % full_node_name) try: - AssertCommand(["gnt-node", "power", "off", node_name], fail=True) + 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) + 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], @@ -351,12 +369,12 @@ def TestOutOfBand(): _AssertOobCall(verify_path, "power-on %s" % full_node_name) try: - AssertCommand(["gnt-node", "power", "off", node_name], fail=True) + 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) + 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], @@ -399,3 +417,8 @@ def TestNodeList(): def TestNodeListFields(): """gnt-node list-fields""" qa_utils.GenericQueryFieldsTest("gnt-node", query.NODE_FIELDS.keys()) + + +def TestNodeListDrbd(node): + """gnt-node list-drbd""" + AssertCommand(["gnt-node", "list-drbd", node["primary"]])