From 58ea8d17b5b6deb4b93ce0f419c449c35a35a0d5 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 18 Jan 2012 20:20:23 +0100
Subject: [PATCH] Fix wrong option names in QA and cluster-merge
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
qa/qa_cluster.py | 6 +++---
qa/qa_instance.py | 2 +-
qa/qa_utils.py | 2 +-
tools/cluster-merge | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index bd3d737d5..a9381a9b8 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -183,7 +183,7 @@ def TestClusterEpo():
# Assert that OOB is unavailable for all nodes
result_output = GetCommandOutput(master["primary"],
- "gnt-node list --verbose --no-header -o"
+ "gnt-node list --verbose --no-headers -o"
" powered")
AssertEqual(compat.all(powered == "(unavail)"
for powered in result_output.splitlines()), True)
@@ -201,7 +201,7 @@ def TestClusterEpo():
# All instances should have been stopped now
result_output = GetCommandOutput(master["primary"],
- "gnt-instance list --no-header -o status")
+ "gnt-instance list --no-headers -o status")
AssertEqual(compat.all(status == "ADMIN_down"
for status in result_output.splitlines()), True)
@@ -210,7 +210,7 @@ def TestClusterEpo():
# All instances should have been started now
result_output = GetCommandOutput(master["primary"],
- "gnt-instance list --no-header -o status")
+ "gnt-instance list --no-headers -o status")
AssertEqual(compat.all(status == "running"
for status in result_output.splitlines()), True)
diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index 45ee521fd..6b2edb282 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -108,7 +108,7 @@ def TestInstanceReboot(instance):
AssertCommand(["gnt-instance", "reboot", name])
master = qa_config.GetMasterNode()
- cmd = ["gnt-instance", "list", "--no-header", "-o", "status", name]
+ cmd = ["gnt-instance", "list", "--no-headers", "-o", "status", name]
result_output = qa_utils.GetCommandOutput(master["primary"],
utils.ShellQuoteArgs(cmd))
AssertEqual(result_output.strip(), constants.INSTST_RUNNING)
diff --git a/qa/qa_utils.py b/qa/qa_utils.py
index 671a6f21a..4fdb46eb7 100644
--- a/qa/qa_utils.py
+++ b/qa/qa_utils.py
@@ -400,7 +400,7 @@ def _List(listcmd, fields, names):
"""
master = qa_config.GetMasterNode()
- cmd = [listcmd, "list", "--separator=|", "--no-header",
+ cmd = [listcmd, "list", "--separator=|", "--no-headers",
"--output", ",".join(fields)]
if names:
diff --git a/tools/cluster-merge b/tools/cluster-merge
index 7162d66c3..c3a0e09bc 100755
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -192,7 +192,7 @@ class Merger(object):
utils.WriteFile(key_path, mode=0600, data=result.stdout)
result = self._RunCmd(cluster, "gnt-node list -o name,offline"
- " --no-header --separator=,", private_key=key_path)
+ " --no-headers --separator=,", private_key=key_path)
if result.failed:
raise errors.RemoteError("Unable to retrieve list of nodes from %s."
" Fail reason: %s; output: %s" %
@@ -201,7 +201,7 @@ class Merger(object):
nodes = [node_status[0] for node_status in nodes_statuses
if node_status[1] == "N"]
- result = self._RunCmd(cluster, "gnt-instance list -o name --no-header",
+ result = self._RunCmd(cluster, "gnt-instance list -o name --no-headers",
private_key=key_path)
if result.failed:
raise errors.RemoteError("Unable to retrieve list of instances from"
--
GitLab