From 43322b01523f471396ee15fb0204aad6cbc49688 Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Thu, 7 Nov 2019 09:00:41 +0100 Subject: [PATCH] neutron: Deduce expected security check results on TLS presence If 'neutron-api' has a certificates relation to vault we have different expectations of the security checklist result. --- zaza/openstack/charm_tests/neutron/tests.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/zaza/openstack/charm_tests/neutron/tests.py b/zaza/openstack/charm_tests/neutron/tests.py index 8657e4b..be20009 100644 --- a/zaza/openstack/charm_tests/neutron/tests.py +++ b/zaza/openstack/charm_tests/neutron/tests.py @@ -90,19 +90,22 @@ class SecurityTest(test_utils.OpenStackBaseTest): def test_security_checklist(self): """Verify expected state with security-checklist.""" - # Changes fixing the below expected failures will be made following - # this initial work to get validation in. There will be bugs targeted - # to each one and resolved independently where possible. - - expected_failures = [ - 'validate-enables-tls', + tls_checks = [ 'validate-uses-tls-for-keystone', ] + expected_failures = [ + 'validate-enables-tls', # LP: #1851610 + ] expected_passes = [ 'validate-file-ownership', 'validate-file-permissions', 'validate-uses-keystone', ] + if zaza.model.get_relation_id( + 'neutron-api', 'vault', remote_interface_name='certificates'): + expected_passes.extend(tls_checks) + else: + expected_failures.extend(tls_checks) for unit in zaza.model.get_units('neutron-api', model_name=self.model_name):