summaryrefslogtreecommitdiffstats
path: root/prh-app-server
diff options
context:
space:
mode:
authorpwielebs <piotr.wielebski@nokia.com>2019-05-30 11:19:32 +0200
committerpwielebs <piotr.wielebski@nokia.com>2019-05-30 11:56:43 +0200
commitdc98386e6e888cc0e0c54bc9e984c9d0ada5e73a (patch)
tree7f5147a128dd4aaa48fbf0410a9396339703675d /prh-app-server
parent37444e2753f351cfe22b4651bcf777b833aeba92 (diff)
Update test json file due to changes in SDK
Change-Id: I343c099502bd6fc63ea4fc22706be96832f67c5f Issue-ID: DCAEGEN2-1501 Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
Diffstat (limited to 'prh-app-server')
-rw-r--r--prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/ConsulConfigurationParserTest.java2
-rw-r--r--prh-app-server/src/test/resources/configurationFromCbs.json (renamed from prh-app-server/src/test/resources/flattened_configuration.json)21
2 files changed, 1 insertions, 22 deletions
diff --git a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/ConsulConfigurationParserTest.java b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/ConsulConfigurationParserTest.java
index 24586a08..79a3873a 100644
--- a/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/ConsulConfigurationParserTest.java
+++ b/prh-app-server/src/test/java/org/onap/dcaegen2/services/prh/configuration/ConsulConfigurationParserTest.java
@@ -46,7 +46,7 @@ import static org.junit.jupiter.api.Assumptions.assumeFalse;
class ConsulConfigurationParserTest {
private final String correctJson =
- new String(Files.readAllBytes(Paths.get(getSystemResource("flattened_configuration.json").toURI())));
+ new String(Files.readAllBytes(Paths.get(getSystemResource("configurationFromCbs.json").toURI())));
private final ImmutableAaiClientConfiguration correctAaiClientConfig =
TestAppConfiguration.createDefaultAaiClientConfiguration();
diff --git a/prh-app-server/src/test/resources/flattened_configuration.json b/prh-app-server/src/test/resources/configurationFromCbs.json
index 4b846b70..85dd4de2 100644
--- a/prh-app-server/src/test/resources/flattened_configuration.json
+++ b/prh-app-server/src/test/resources/configurationFromCbs.json
@@ -1,43 +1,22 @@
{
"config":{
- "dmaap.dmaapConsumerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT",
- "dmaap.dmaapConsumerConfiguration.dmaapHostName":"message-router.onap.svc.cluster.local",
- "dmaap.dmaapConsumerConfiguration.dmaapPortNumber":3904,
- "dmaap.dmaapConsumerConfiguration.dmaapTopicName":"/events/unauthenticated.SEC_OTHER_OUTPUT",
- "dmaap.dmaapConsumerConfiguration.dmaapProtocol":"http",
"dmaap.dmaapConsumerConfiguration.dmaapUserName":"admin",
"dmaap.dmaapConsumerConfiguration.dmaapUserPassword":"admin",
"dmaap.dmaapConsumerConfiguration.dmaapContentType":"application/json",
"dmaap.dmaapConsumerConfiguration.consumerId":"c12",
"dmaap.dmaapConsumerConfiguration.consumerGroup":"OpenDCAE-c12",
"dmaap.dmaapConsumerConfiguration.timeoutMs":-1,
- "dmaap.dmaapConsumerConfiguration.messageLimit":-1,
- "dmaap.dmaapProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY",
- "dmaap.dmaapProducerConfiguration.dmaapHostName":"message-router.onap.svc.cluster.local",
- "dmaap.dmaapProducerConfiguration.dmaapPortNumber":3904,
- "dmaap.dmaapProducerConfiguration.dmaapTopicName":"/events/unauthenticated.PNF_READY",
- "dmaap.dmaapProducerConfiguration.dmaapProtocol":"http",
"dmaap.dmaapProducerConfiguration.dmaapUserName":"admin",
"dmaap.dmaapProducerConfiguration.dmaapUserPassword":"admin",
"dmaap.dmaapProducerConfiguration.dmaapContentType":"application/json",
- "dmaap.dmaapUpdateProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE",
- "dmaap.dmaapUpdateProducerConfiguration.dmaapHostName":"dmaap-mr",
- "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber":2223,
- "dmaap.dmaapUpdateProducerConfiguration.dmaapTopicName":"events/unauthenticated.PNF_UPDATE",
- "dmaap.dmaapUpdateProducerConfiguration.dmaapProtocol":"http",
"dmaap.dmaapUpdateProducerConfiguration.dmaapUserName":"admin",
"dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword":"admin",
"dmaap.dmaapUpdateProducerConfiguration.dmaapContentType":"application/json",
"aai.aaiClientConfiguration.pnfUrl": "https://aai.onap.svc.cluster.local:8443/aai/v12/network/pnfs/pnf",
- "aai.aaiClientConfiguration.aaiHost":"aai.onap.svc.cluster.local",
- "aai.aaiClientConfiguration.aaiHostPortNumber":8443,
- "aai.aaiClientConfiguration.aaiProtocol":"https",
"aai.aaiClientConfiguration.aaiUserName":"AAI",
"aai.aaiClientConfiguration.aaiUserPassword":"AAI",
"aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors":true,
- "aai.aaiClientConfiguration.aaiBasePath":"/aai/v12",
- "aai.aaiClientConfiguration.aaiPnfPath":"/network/pnfs/pnf",
"aai.aaiClientConfiguration.aaiServiceInstancePath":"/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}",
"aai.aaiClientConfiguration.aaiHeaders":{
"X-FromAppId":"prh",