summaryrefslogtreecommitdiffstats
path: root/prh-app-server/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'prh-app-server/src/test')
-rw-r--r--prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/TestAppConfiguration.java27
-rw-r--r--prh-app-server/src/test/resources/correct_config.json9
-rw-r--r--prh-app-server/src/test/resources/flattened_configuration.json9
-rw-r--r--prh-app-server/src/test/resources/incorrect_config.json9
4 files changed, 24 insertions, 30 deletions
diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/TestAppConfiguration.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/TestAppConfiguration.java
index 88aa434c..37463575 100644
--- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/TestAppConfiguration.java
+++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/TestAppConfiguration.java
@@ -36,11 +36,10 @@ public class TestAppConfiguration {
.dmaapProtocol("http")
.dmaapUserName("admin")
.dmaapUserPassword("admin")
- .keyFile("/opt/app/prh/local/org.onap.prh.keyfile")
- .trustStore("/opt/app/prh/local/org.onap.prh.trust.jks")
- .trustStorePassword("change_it")
- .keyStore("/opt/app/prh/local/org.onap.prh.p12")
- .keyStorePassword("change_it")
+ .trustStorePath("/opt/app/prh/local/org.onap.prh.trust.jks")
+ .trustStorePasswordPath("change_it")
+ .keyStorePath("/opt/app/prh/local/org.onap.prh.p12")
+ .keyStorePasswordPath("change_it")
.enableDmaapCertAuth(false)
.dmaapTopicName("/events/unauthenticated.SEC_OTHER_OUTPUT")
.timeoutMs(-1)
@@ -56,11 +55,10 @@ public class TestAppConfiguration {
.dmaapProtocol("http")
.dmaapUserName("admin")
.dmaapUserPassword("admin")
- .keyFile("/opt/app/prh/local/org.onap.prh.keyfile")
- .trustStore("/opt/app/prh/local/org.onap.prh.trust.jks")
- .trustStorePassword("change_it")
- .keyStore("/opt/app/prh/local/org.onap.prh.p12")
- .keyStorePassword("change_it")
+ .trustStorePath("/opt/app/prh/local/org.onap.prh.trust.jks")
+ .trustStorePasswordPath("change_it")
+ .keyStorePath("/opt/app/prh/local/org.onap.prh.p12")
+ .keyStorePasswordPath("change_it")
.enableDmaapCertAuth(false)
.dmaapTopicName("/events/unauthenticated.PNF_READY")
.build();
@@ -76,11 +74,10 @@ public class TestAppConfiguration {
.aaiIgnoreSslCertificateErrors(true)
.aaiBasePath("/aai/v12")
.aaiPnfPath("/network/pnfs/pnf")
- .keyFile("/opt/app/prh/local/org.onap.prh.keyfile")
- .trustStore("/opt/app/prh/local/org.onap.prh.trust.jks")
- .trustStorePassword("change_it")
- .keyStore("/opt/app/prh/local/org.onap.prh.p12")
- .keyStorePassword("change_it")
+ .trustStorePath("/opt/app/prh/local/org.onap.prh.trust.jks")
+ .trustStorePasswordPath("change_it")
+ .keyStorePath("/opt/app/prh/local/org.onap.prh.p12")
+ .keyStorePasswordPath("change_it")
.enableAaiCertAuth(false)
.build();
}
diff --git a/prh-app-server/src/test/resources/correct_config.json b/prh-app-server/src/test/resources/correct_config.json
index d250114d..5c80bc99 100644
--- a/prh-app-server/src/test/resources/correct_config.json
+++ b/prh-app-server/src/test/resources/correct_config.json
@@ -45,11 +45,10 @@
}
},
"security": {
- "keyFile": "/opt/app/prh/local/org.onap.prh.keyfile",
- "trustStore": "/opt/app/prh/local/org.onap.prh.trust.jks",
- "trustStorePassword": "change it",
- "keyStore": "/opt/app/prh/local/org.onap.prh.p12",
- "keyStorePassword": "change it",
+ "trustStorePath": "/opt/app/prh/local/org.onap.prh.trust.jks",
+ "trustStorePasswordPath": "change it",
+ "keyStorePath": "/opt/app/prh/local/org.onap.prh.p12",
+ "keyStorePasswordPath": "change it",
"enableAaiCertAuth": "false",
"enableDmaapCertAuth": "false"
}
diff --git a/prh-app-server/src/test/resources/flattened_configuration.json b/prh-app-server/src/test/resources/flattened_configuration.json
index 6584a594..f8def2ef 100644
--- a/prh-app-server/src/test/resources/flattened_configuration.json
+++ b/prh-app-server/src/test/resources/flattened_configuration.json
@@ -25,11 +25,10 @@
"aai.aaiClientConfiguration.aaiProtocol": "https",
"dmaap.dmaapProducerConfiguration.dmaapUserName": "admin",
"dmaap.dmaapProducerConfiguration.dmaapUserPassword": "admin",
- "security.keyFile": "/opt/app/prh/local/org.onap.prh.keyfile",
- "security.trustStore": "/opt/app/prh/local/org.onap.prh.trust.jks",
- "security.trustStorePassword": "change_it",
- "security.keyStore": "/opt/app/prh/local/org.onap.prh.p12",
- "security.keyStorePassword": "change_it",
+ "security.trustStorePath": "/opt/app/prh/local/org.onap.prh.trust.jks",
+ "security.trustStorePasswordPath": "change_it",
+ "security.keyStorePath": "/opt/app/prh/local/org.onap.prh.p12",
+ "security.keyStorePasswordPath": "change_it",
"security.enableAaiCertAuth": false,
"security.enableDmaapCertAuth": false
} \ No newline at end of file
diff --git a/prh-app-server/src/test/resources/incorrect_config.json b/prh-app-server/src/test/resources/incorrect_config.json
index f320d982..a682402d 100644
--- a/prh-app-server/src/test/resources/incorrect_config.json
+++ b/prh-app-server/src/test/resources/incorrect_config.json
@@ -45,11 +45,10 @@
}
},
"security": {
- "keyFile": "/opt/app/prh/local/org.onap.prh.keyfile",
- "trustStore": "/opt/app/prh/local/org.onap.prh.trust.jks",
- "trustStorePassword": "change it",
- "keyStore": "/opt/app/prh/local/org.onap.prh.p12",
- "keyStorePassword": "change it",
+ "trustStorePath": "/opt/app/prh/local/org.onap.prh.trust.jks",
+ "trustStorePasswordPath": "change it",
+ "keyStorePath": "/opt/app/prh/local/org.onap.prh.p12",
+ "keyStorePasswordPath": "change it",
"enableAaiCertAuth": "false",
"enableDmaapCertAuth": "false"
}