diff options
| author |   kjaniak <kornel.janiak@nokia.com> | 2020-06-26 12:56:51 +0200 |
|---|---|---|
| committer |   Tomasz Wrobel <tomasz.wrobel@nokia.com> | 2020-08-10 09:18:18 +0200 |
| commit | bc2e6287569ed6a848acf31b26097f54934baf9b (patch) | |
| tree | 2d974bbd9c74ea586a69c94ceeea3e17e15c085d /mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/TlsInfoTest.java | |
| parent | e996e07eea9189ffd89418047eb26293ef33e419 (diff) | |
Add factories for Ext tls parameters
Code cleanup, renames
Issue-ID: DCAEGEN2-2251
Change-Id: Ibf36780473480210bea1c76d117b28c71831487a
Signed-off-by: kjaniak <kornel.janiak@nokia.com>
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Diffstat (limited to 'mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/TlsInfoTest.java')
| -rw-r--r-- | mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/TlsInfoTest.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/TlsInfoTest.java b/mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/TlsInfoTest.java index 6bd7b40..8adf03d 100644 --- a/mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/TlsInfoTest.java +++ b/mod/bpgenerator/src/test/java/org/onap/blueprintgenerator/core/TlsInfoTest.java @@ -1,4 +1,4 @@ -/**============LICENSE_START======================================================= +/*============LICENSE_START======================================================= org.onap.dcae ================================================================================ Copyright (c) 2020 Nokia. All rights reserved. @@ -23,9 +23,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.onap.blueprintgenerator.models.blueprint.Blueprint; -import org.onap.blueprintgenerator.models.blueprint.ExternalTlsInfo; import org.onap.blueprintgenerator.models.blueprint.Node; -import org.onap.blueprintgenerator.models.blueprint.TlsInfo; +import org.onap.blueprintgenerator.models.blueprint.tls.TlsInfo; +import org.onap.blueprintgenerator.models.blueprint.tls.impl.ExternalCertificateParameters; +import org.onap.blueprintgenerator.models.blueprint.tls.impl.ExternalTlsInfo; import org.onap.blueprintgenerator.models.componentspec.ComponentSpec; import java.util.Arrays; @@ -95,16 +96,16 @@ public class TlsInfoTest { ExternalTlsInfo externalTlsInfo = node.getProperties().getExternal_cert(); assertNotNull(externalTlsInfo); - assertEquals("external_cert_ca_name", externalTlsInfo.getCaName().getGet_input()); - assertEquals("external_cert_cert_type", externalTlsInfo.getCertType().getGet_input()); - assertEquals("external_cert_use_external_tls", externalTlsInfo.getUseExternalTls().getGet_input()); + assertEquals("external_cert_ca_name", externalTlsInfo.getCaName().getBpInputName()); + assertEquals("external_cert_cert_type", externalTlsInfo.getCertType().getBpInputName()); + assertEquals("external_cert_use_external_tls", externalTlsInfo.getUseExternalTls().getBpInputName()); assertEquals("/opt/app/dcae-certificate/", externalTlsInfo.getExternalCertDirectory()); - ExternalTlsInfo.ExternalCertificateParameters extCertParams = externalTlsInfo.getExternalCertificateParameters(); + ExternalCertificateParameters extCertParams = externalTlsInfo.getExternalCertificateParameters(); assertNotNull(extCertParams); - assertEquals("external_cert_common_name", extCertParams.getCommonName().getGet_input()); - assertEquals("external_cert_sans", extCertParams.getSans().getGet_input()); + assertEquals("external_cert_common_name", extCertParams.getCommonName().getBpInputName()); + assertEquals("external_cert_sans", extCertParams.getSans().getBpInputName()); } private void assertBlueprintContainsTlsInfoWithUseFlagDefault(Blueprint bp, boolean useFlagDefault) { @@ -115,7 +116,7 @@ public class TlsInfoTest { //should create proper tlsInfo object in node properties TlsInfo tlsInfo = node.getProperties().getTls_info(); - assertEquals("use_tls", tlsInfo.getUseTls().getGet_input()); + assertEquals("use_tls", tlsInfo.getUseTls().getBpInputName()); assertEquals("/opt/app/dcae-certificate/", tlsInfo.getCertDirectory()); } |