Interdiff:
diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index 5773987..553aa3a 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -1544,7 +1544,7 @@ def TestInstanceAddOsParams():
if not qa_config.IsTemplateSupported(constants.DT_PLAIN):
return
- pnode = qa_config.AcquireNode()
+ master = qa_config.GetMasterNode()
instance = qa_config.AcquireInstance()
secret_keys = ["param1", "param2"]
@@ -1553,34 +1553,32 @@ def TestInstanceAddOsParams():
"--disk-template=%s" % constants.DT_PLAIN,
"--os-parameters-secret",
"param1=secret1,param2=secret2",
- "--node=%s" % pnode.primary] +
+ "--node=%s" % master.primary] +
GetGenericAddParameters(instance, constants.DT_PLAIN))
cmd.append("--submit")
cmd.append("--print-jobid")
cmd.append(instance.name)
- _TestRedactionOfSecretOsParams(pnode.primary, cmd, secret_keys)
+ _TestRedactionOfSecretOsParams(master.primary, cmd, secret_keys)
TestInstanceRemove(instance)
instance.Release()
- pnode.Release()
def TestSecretOsParams():
"""Tests secret os parameter transmission"""
- pnode = qa_config.AcquireNode()
+ master = qa_config.GetMasterNode()
secret_keys = ["param1", "param2"]
cmd = (["gnt-debug", "test-osparams", "--os-parameters-secret",
"param1=secret1,param2=secret2", "--submit", "--print-jobid"])
- _TestRedactionOfSecretOsParams(pnode.primary, cmd, secret_keys)
+ _TestRedactionOfSecretOsParams(master.primary, cmd, secret_keys)
cmd_output = stdout_of(["gnt-debug", "test-osparams",
"--os-parameters-secret",
"param1=secret1,param2=secret2"])
AssertIn("\'param1\': \'secret1\'", cmd_output)
AssertIn("\'param2\': \'secret2\'", cmd_output)
- pnode.Release()
On Thu, Jul 9, 2015 at 5:25 PM, Klaus Aehlig <[email protected]> wrote:
> > + pnode = qa_config.AcquireNode()
> > secret_keys = ["param1", "param2"]
> > cmd = (["gnt-debug", "test-osparams", "--os-parameters-secret",
> > "param1=secret1,param2=secret2", "--submit", "--print-jobid"])
> > - _TestRedactionOfSecretOsParams(cmd, secret_keys)
> > + _TestRedactionOfSecretOsParams(pnode.primary, cmd, secret_keys)
> >
> > cmd_output = stdout_of(["gnt-debug", "test-osparams",
> > "--os-parameters-secret",
> > "param1=secret1,param2=secret2"])
> > AssertIn("\'param1\': \'secret1\'", cmd_output)
> > AssertIn("\'param2\': \'secret2\'", cmd_output)
> > + pnode.Release()
>
> If you Acquire an arbitrary node, how do you know you'll get a master
> candidate (so that you can check the job files on that vNode)?
> It is quite likely, you get one, but I don't think, it's guaranteed.
>
>
> --
> Klaus Aehlig
> Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
> Registergericht und -nummer: Hamburg, HRB 86891
> Sitz der Gesellschaft: Hamburg
> Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
>
--
Lisa Velden
Software Engineer
[email protected]
Google Germany GmbH
Dienerstraße 12
80331 München
Geschäftsführer: Graham Law, Christine Elizabeth Flores
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
