[SDC-DISTRO-CLIENT] SSL config updates

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: Iacaf5072241e56bf72db13acef0f533814ae8989
Issue-ID: SDC-4476

4 files changed, 11 insertions, 8 deletions

diff --git a/sdc-distribution-ci/etc/sdc-user-keystore.jks b/sdc-distribution-ci/etc/sdc-user-keystore.jks
new file mode 100644
index 0000000..7c3c72a
--- /dev/null
+++ b/sdc-distribution-ci/etc/sdc-user-keystore.jks
diff --git a/sdc-distribution-ci/etc/sdc-user-truststore.jks b/sdc-distribution-ci/etc/sdc-user-truststore.jks
new file mode 100644
index 0000000..d1fb017
--- /dev/null
+++ b/sdc-distribution-ci/etc/sdc-user-truststore.jks
diff --git a/sdc-distribution-ci/src/main/java/org/onap/test/core/config/DistributionClientConfig.java b/sdc-distribution-ci/src/main/java/org/onap/test/core/config/DistributionClientConfig.java
index f229216..fc818fd 100644
--- a/sdc-distribution-ci/src/main/java/org/onap/test/core/config/DistributionClientConfig.java
+++ b/sdc-distribution-ci/src/main/java/org/onap/test/core/config/DistributionClientConfig.java
@@ -34,8 +34,14 @@ public class DistributionClientConfig implements IConfiguration {
     public static final int DEFAULT_POLLING_INTERVAL = 20;
     public static final int DEFAULT_POLLING_TIMEOUT = 20;
     public static final String DEFAULT_USER = "dcae";
-    public static final String DEFAULT_KEY_STORE_PATH = "etc/sdc-client.jks";
-    public static final String DEFAULT_KEY_STORE_PASSWORD = "Aa123456";
+    private String keyStorePath;
+    private String keyStorePassword;
+    public static final String DEFAULT_KEY_STORE_PATH = "etc/sdc-user-keystore.jks";
+    public static final String DEFAULT_KEY_STORE_PASSWORD = "zreRDCnNLsZ7";
+    public static final String DEFAULT_TRUST_STORE_PATH = "etc/sdc-user-truststore.jks";
+    public static final String DEFAULT_TRUST_STORE_PASSWORD = "changeit";
+    public String trustStorePath;
+    public String trustStorePassword;
     public static final boolean DEFAULT_ACTIVATE_SERVER_TLS_AUTH = false;
     public static final boolean DEFAULT_IS_FILTER_IN_EMPTY_RESOURCES = true;
     public static final boolean DEFAULT_USE_HTTPS_WITH_SDC = false;
@@ -48,10 +54,6 @@ public class DistributionClientConfig implements IConfiguration {
     private String consumerGroup;
     private String environmentName;
     private String comsumerID;
-    private String keyStorePath;
-    private String keyStorePassword;
-    private final String trustStorePath;
-    private final String trustStorePassword;
     private boolean activateServerTLSAuth;
     private boolean isFilterInEmptyResources;
     private boolean useHttpsWithSDC;
@@ -77,8 +79,8 @@ public class DistributionClientConfig implements IConfiguration {
         this.user = DEFAULT_USER;
         this.keyStorePath = DEFAULT_KEY_STORE_PATH;
         this.keyStorePassword = DEFAULT_KEY_STORE_PASSWORD;
-        this.trustStorePath = DEFAULT_KEY_STORE_PATH;
-        this.trustStorePassword = DEFAULT_KEY_STORE_PASSWORD;
+        this.trustStorePath = DEFAULT_TRUST_STORE_PATH;
+        this.trustStorePassword = DEFAULT_TRUST_STORE_PASSWORD;
         this.activateServerTLSAuth = DEFAULT_ACTIVATE_SERVER_TLS_AUTH;
         this.isFilterInEmptyResources = DEFAULT_IS_FILTER_IN_EMPTY_RESOURCES;
         this.useHttpsWithSDC = DEFAULT_USE_HTTPS_WITH_SDC;
diff --git a/sdc-distribution-ci/src/test/java/org/onap/test/core/service/CustomKafkaContainer.java b/sdc-distribution-ci/src/test/java/org/onap/test/core/service/CustomKafkaContainer.java
index e2eabc1..8de8949 100644
--- a/sdc-distribution-ci/src/test/java/org/onap/test/core/service/CustomKafkaContainer.java
+++ b/sdc-distribution-ci/src/test/java/org/onap/test/core/service/CustomKafkaContainer.java
@@ -33,6 +33,7 @@ public class CustomKafkaContainer extends FixedHostPortGenericContainer<CustomKa
         this.externalZookeeperConnect = null;
         this.withExposedPorts(9093);
         this.withEnv("KAFKA_LISTENERS", "PLAINTEXT://0.0.0.0:9093,BROKER://0.0.0.0:9092");
+        this.withEnv("KAFKA_ADVERTISED_LISTENERS", "SSL");
         this.withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", "BROKER:PLAINTEXT,PLAINTEXT:PLAINTEXT");
         this.withEnv("KAFKA_INTER_BROKER_LISTENER_NAME", "BROKER");
         this.withEnv("KAFKA_BROKER_ID", "1");