From 5983d76f162aef34740a05ae4e78c7d9e2b3c20a Mon Sep 17 00:00:00 2001
From: TamasBakai <tamas.bakai@est.tech>
Date: Wed, 10 Apr 2019 10:02:21 +0000
Subject: Updating certificates

Issue-ID: DCAEGEN2-1300
Change-Id: I9ce457b69e5866e77a465fb040d196b8905ca274
Signed-off-by: TamasBakai <tamas.bakai@est.tech>
---
 .../collectors/datafile/configuration/AppConfigTest.java       |  7 ++-----
 .../datafile/configuration/CloudConfigParserTest.java          | 10 ++++------
 datafile-app-server/src/test/resources/datafile_endpoints.json |  4 ++--
 3 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'datafile-app-server/src/test')

diff --git a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfigTest.java b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfigTest.java
index 2c136304..1847e3b8 100644
--- a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfigTest.java
+++ b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfigTest.java
@@ -24,17 +24,14 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -186,9 +183,9 @@ class AppConfigTest {
         dmaapConfigs.add("dmaapProducerConfiguration", dmaapProducerConfigData);
 
         JsonObject ftpesConfigData = new JsonObject();
-        ftpesConfigData.addProperty("keyCert", "config/ftpKey.jks");
+        ftpesConfigData.addProperty("keyCert", "config/dfc.jks");
         ftpesConfigData.addProperty("keyPassword", "secret");
-        ftpesConfigData.addProperty("trustedCA", "config/cacerts");
+        ftpesConfigData.addProperty("trustedCA", "config/ftp.jks");
         ftpesConfigData.addProperty("trustedCAPassword", "secret");
 
         JsonObject security = new JsonObject();
diff --git a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParserTest.java b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParserTest.java
index b67fac23..1adb3709 100644
--- a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParserTest.java
+++ b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParserTest.java
@@ -17,9 +17,7 @@
 package org.onap.dcaegen2.collectors.datafile.configuration;
 
 import static org.assertj.core.api.Assertions.assertThat;
-
 import com.google.gson.JsonObject;
-
 import org.junit.jupiter.api.Test;
 import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapConsumerConfiguration;
 import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapPublisherConfiguration;
@@ -66,9 +64,9 @@ class CloudConfigParserTest {
 
     private static final ImmutableFtpesConfig CORRECT_FTPES_CONFIGURATION = //
             new ImmutableFtpesConfig.Builder() //
-                    .keyCert("/config/ftpKey.jks") //
+                    .keyCert("/config/dfc.jks") //
                     .keyPassword("secret") //
-                    .trustedCA("config/cacerts") //
+                    .trustedCA("config/ftp.jks") //
                     .trustedCAPassword("secret") //
                     .build();
 
@@ -119,9 +117,9 @@ class CloudConfigParserTest {
         config.addProperty("dmaap.dmaapProducerConfiguration.dmaapPortNumber", 3907);
         config.addProperty("dmaap.dmaapProducerConfiguration.dmaapUserName", "dradmin");
         config.addProperty("dmaap.dmaapProducerConfiguration.dmaapUserPassword", "dradmin");
-        config.addProperty("dmaap.ftpesConfig.keyCert", "/config/ftpKey.jks");
+        config.addProperty("dmaap.ftpesConfig.keyCert", "/config/dfc.jks");
         config.addProperty("dmaap.ftpesConfig.keyPassword", "secret");
-        config.addProperty("dmaap.ftpesConfig.trustedCA", "config/cacerts");
+        config.addProperty("dmaap.ftpesConfig.trustedCA", "config/ftp.jks");
         config.addProperty("dmaap.ftpesConfig.trustedCAPassword", "secret");
 
         config.addProperty("dmaap.security.trustStorePath", "trustStorePath");
diff --git a/datafile-app-server/src/test/resources/datafile_endpoints.json b/datafile-app-server/src/test/resources/datafile_endpoints.json
index a9545f40..8cf3224a 100644
--- a/datafile-app-server/src/test/resources/datafile_endpoints.json
+++ b/datafile-app-server/src/test/resources/datafile_endpoints.json
@@ -26,9 +26,9 @@
         },
         "ftp": {
             "ftpesConfiguration": {
-                "keyCert": "/config/ftpKey.jks",
+                "keyCert": "/config/dfc.jks",
                 "keyPassword": "secret",
-                "trustedCA": "/config/ftpKey.jks",
+                "trustedCA": "/config/ftp.jks",
                 "trustedCAPassword": "secret"
             }
         },
-- 
cgit 1.2.3-korg