Commit 67b44636 authored by Lisa Velden's avatar Lisa Velden

Use correct path for job file inspection

Determine the job file path with qa_utils.MakeNodePath, so that we
get the correct path, even for vcluster.
Signed-off-by: default avatarLisa Velden <velden@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parent 70efca11
...@@ -1517,7 +1517,7 @@ def TestInstanceCommunication(instance, master): ...@@ -1517,7 +1517,7 @@ def TestInstanceCommunication(instance, master):
print result_output print result_output
def _TestRedactionOfSecretOsParams(cmd, secret_keys): def _TestRedactionOfSecretOsParams(node, cmd, secret_keys):
"""Tests redaction of secret os parameters """Tests redaction of secret os parameters
""" """
...@@ -1525,7 +1525,8 @@ def _TestRedactionOfSecretOsParams(cmd, secret_keys): ...@@ -1525,7 +1525,8 @@ def _TestRedactionOfSecretOsParams(cmd, secret_keys):
debug_delay_id = int(stdout_of(["gnt-debug", "delay", "--print-jobid", debug_delay_id = int(stdout_of(["gnt-debug", "delay", "--print-jobid",
"--submit", "300"])) "--submit", "300"]))
cmd_jid = int(stdout_of(cmd)) cmd_jid = int(stdout_of(cmd))
job_file = "/var/lib/ganeti/queue/job-%s" % cmd_jid job_file_abspath = "%s/job-%s" % (pathutils.QUEUE_DIR, cmd_jid)
job_file = qa_utils.MakeNodePath(node, job_file_abspath)
for k in secret_keys: for k in secret_keys:
grep_cmd = ["grep", "\"%s\":\"<redacted>\"" % k, job_file] grep_cmd = ["grep", "\"%s\":\"<redacted>\"" % k, job_file]
...@@ -1543,7 +1544,7 @@ def TestInstanceAddOsParams(): ...@@ -1543,7 +1544,7 @@ def TestInstanceAddOsParams():
if not qa_config.IsTemplateSupported(constants.DT_PLAIN): if not qa_config.IsTemplateSupported(constants.DT_PLAIN):
return return
pnode = qa_config.AcquireNode() master = qa_config.GetMasterNode()
instance = qa_config.AcquireInstance() instance = qa_config.AcquireInstance()
secret_keys = ["param1", "param2"] secret_keys = ["param1", "param2"]
...@@ -1552,26 +1553,26 @@ def TestInstanceAddOsParams(): ...@@ -1552,26 +1553,26 @@ def TestInstanceAddOsParams():
"--disk-template=%s" % constants.DT_PLAIN, "--disk-template=%s" % constants.DT_PLAIN,
"--os-parameters-secret", "--os-parameters-secret",
"param1=secret1,param2=secret2", "param1=secret1,param2=secret2",
"--node=%s" % pnode.primary] + "--node=%s" % master.primary] +
GetGenericAddParameters(instance, constants.DT_PLAIN)) GetGenericAddParameters(instance, constants.DT_PLAIN))
cmd.append("--submit") cmd.append("--submit")
cmd.append("--print-jobid") cmd.append("--print-jobid")
cmd.append(instance.name) cmd.append(instance.name)
_TestRedactionOfSecretOsParams(cmd, secret_keys) _TestRedactionOfSecretOsParams(master.primary, cmd, secret_keys)
TestInstanceRemove(instance) TestInstanceRemove(instance)
instance.Release() instance.Release()
pnode.Release()
def TestSecretOsParams(): def TestSecretOsParams():
"""Tests secret os parameter transmission""" """Tests secret os parameter transmission"""
master = qa_config.GetMasterNode()
secret_keys = ["param1", "param2"] secret_keys = ["param1", "param2"]
cmd = (["gnt-debug", "test-osparams", "--os-parameters-secret", cmd = (["gnt-debug", "test-osparams", "--os-parameters-secret",
"param1=secret1,param2=secret2", "--submit", "--print-jobid"]) "param1=secret1,param2=secret2", "--submit", "--print-jobid"])
_TestRedactionOfSecretOsParams(cmd, secret_keys) _TestRedactionOfSecretOsParams(master.primary, cmd, secret_keys)
cmd_output = stdout_of(["gnt-debug", "test-osparams", cmd_output = stdout_of(["gnt-debug", "test-osparams",
"--os-parameters-secret", "--os-parameters-secret",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment