From dc98386e6e888cc0e0c54bc9e984c9d0ada5e73a Mon Sep 17 00:00:00 2001 From: pwielebs Date: Thu, 30 May 2019 11:19:32 +0200 Subject: Update test json file due to changes in SDK Change-Id: I343c099502bd6fc63ea4fc22706be96832f67c5f Issue-ID: DCAEGEN2-1501 Signed-off-by: pwielebs --- .../ConsulConfigurationParserTest.java | 2 +- .../src/test/resources/configurationFromCbs.json | 57 ++++++++++++++++ .../test/resources/flattened_configuration.json | 78 ---------------------- 3 files changed, 58 insertions(+), 79 deletions(-) create mode 100644 prh-app-server/src/test/resources/configurationFromCbs.json delete mode 100644 prh-app-server/src/test/resources/flattened_configuration.json 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/configurationFromCbs.json b/prh-app-server/src/test/resources/configurationFromCbs.json new file mode 100644 index 00000000..85dd4de2 --- /dev/null +++ b/prh-app-server/src/test/resources/configurationFromCbs.json @@ -0,0 +1,57 @@ +{ + "config":{ + "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.dmaapProducerConfiguration.dmaapUserName":"admin", + "dmaap.dmaapProducerConfiguration.dmaapUserPassword":"admin", + "dmaap.dmaapProducerConfiguration.dmaapContentType":"application/json", + "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.aaiUserName":"AAI", + "aai.aaiClientConfiguration.aaiUserPassword":"AAI", + "aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors":true, + "aai.aaiClientConfiguration.aaiServiceInstancePath":"/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}", + "aai.aaiClientConfiguration.aaiHeaders":{ + "X-FromAppId":"prh", + "X-TransactionId":"9999", + "Accept":"application/json", + "Real-Time":"true", + "Authorization":"Basic QUFJOkFBSQ==" + }, + "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, + "streams_publishes":{ + "pnf-update":{ + "type": "message_router", + "dmaap_info":{ + "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE" + } + }, + "pnf-ready":{ + "type": "message_router", + "dmaap_info":{ + "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY" + } + } + }, + "streams_subscribes":{ + "ves-reg-output":{ + "type": "message_router", + "dmaap_info":{ + "topic_url":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT" + } + } + } + } +} \ No newline at end of file diff --git a/prh-app-server/src/test/resources/flattened_configuration.json b/prh-app-server/src/test/resources/flattened_configuration.json deleted file mode 100644 index 4b846b70..00000000 --- a/prh-app-server/src/test/resources/flattened_configuration.json +++ /dev/null @@ -1,78 +0,0 @@ -{ - "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", - "X-TransactionId":"9999", - "Accept":"application/json", - "Real-Time":"true", - "Authorization":"Basic QUFJOkFBSQ==" - }, - "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, - "streams_publishes":{ - "pnf-update":{ - "type": "message_router", - "dmaap_info":{ - "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE" - } - }, - "pnf-ready":{ - "type": "message_router", - "dmaap_info":{ - "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY" - } - } - }, - "streams_subscribes":{ - "ves-reg-output":{ - "type": "message_router", - "dmaap_info":{ - "topic_url":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT" - } - } - } - } -} \ No newline at end of file -- cgit 1.2.3-korg