LGTM, thanks
On Wed, Jul 8, 2015 at 9:32 AM, Lisa Velden <[email protected]> wrote:
> Interdiff:
>
> diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
> index 77e2cce..ea61b53 100755
> --- a/qa/ganeti-qa.py
> +++ b/qa/ganeti-qa.py
> @@ -1065,7 +1065,7 @@ def RunQa():
> qa_instance.TestInstanceCreationRestrictedByDiskTemplates)
>
> RunTestIf("instance-add-osparams", qa_instance.TestInstanceAddOsParams)
> - RunTestIf("instance-add-osparams", qa_instance.TestOsParams)
> + RunTestIf("instance-add-osparams", qa_instance.TestSecretOsParams)
>
> # Test removing instance with offline drbd secondary
> if qa_config.TestEnabled(["instance-remove-drbd-offline",
> diff --git a/qa/qa_instance.py b/qa/qa_instance.py
> index e45fe76..cc2db4e 100644
> --- a/qa/qa_instance.py
> +++ b/qa/qa_instance.py
> @@ -1571,7 +1571,9 @@ def TestInstanceAddOsParams():
> pnode.Release()
>
>
> -def TestOsParams():
> +def TestSecretOsParams():
> + """Tests secret os parameter transmission"""
> +
> secret_keys = ["param1", "param2"]
> cmd = (["gnt-debug", "test-osparams", "--os-parameters-secret",
> "param1=secret1,param2=secret2", "--submit", "--print-jobid"])
>
> On Tue, Jul 7, 2015 at 12:42 PM, Hrvoje Ribicic <[email protected]> wrote:
>
>>
>>
>> On Mon, Jul 6, 2015 at 10:21 PM, 'Lisa Velden' via ganeti-devel <
>> [email protected]> wrote:
>>
>>> This test is done with the newly introduced opcode 'gnt-debug
>>> test-osparams'. Redaction of secret parameters within the job file is
>>> also tested again with this opcode.
>>>
>>> Signed-off-by: Lisa Velden <[email protected]>
>>> ---
>>> qa/ganeti-qa.py | 1 +
>>> qa/qa_instance.py | 13 +++++++++++++
>>> 2 files changed, 14 insertions(+)
>>>
>>> diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
>>> index e537b70..bc6dd52 100755
>>> --- a/qa/ganeti-qa.py
>>> +++ b/qa/ganeti-qa.py
>>> @@ -1068,6 +1068,7 @@ def RunQa():
>>> RunTestIf("instance-add-osparams",
>>> qa_instance.TestInstanceAddOsParams,
>>> [pnode])
>>> pnode.Release()
>>> + RunTestIf("instance-add-osparams", qa_instance.TestOsParams)
>>>
>>> # Test removing instance with offline drbd secondary
>>> if qa_config.TestEnabled(["instance-remove-drbd-offline",
>>> diff --git a/qa/qa_instance.py b/qa/qa_instance.py
>>> index 0321da9..91d4c78 100644
>>> --- a/qa/qa_instance.py
>>> +++ b/qa/qa_instance.py
>>> @@ -1539,6 +1539,19 @@ def TestInstanceAddOsParams(nodes):
>>> instance.Release()
>>>
>>>
>>> +def TestOsParams():
>>>
>>
>> Please improve this function name - it is not clear you are testing the
>> transmission of secret params.
>>
>> Perhaps call it TestSecretOsParams, and add the missing docstring?
>> The one-line docstring that gets output during the QA in this case.
>>
>>
>>> + secret_keys = ["param1", "param2"]
>>> + cmd = (["gnt-debug", "test-osparams", "--os-parameters-secret",
>>> + "param1=secret1,param2=secret2", "--submit", "--print-jobid"])
>>> + _TestRedactionOfSecretOsParams(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)
>>> +
>>> +
>>> def _TestRedactionOfSecretOsParams(cmd, secret_keys):
>>> """Tests redaction of secret os parameters"""
>>>
>>> --
>>> 2.4.3.573.g4eafbef
>>>
>>>
>> Hrvoje Ribicic
>> Ganeti Engineering
>> Google Germany GmbH
>> Dienerstr. 12, 80331, München
>>
>> Geschäftsführer: Graham Law, Christine Elizabeth Flores
>> Registergericht und -nummer: Hamburg, HRB 86891
>> Sitz der Gesellschaft: Hamburg
>>
>
>
>
> --
> 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
>
Hrvoje Ribicic
Ganeti Engineering
Google Germany GmbH
Dienerstr. 12, 80331, München
Geschäftsführer: Graham Law, Christine Elizabeth Flores
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
