diff options
| author |   grabinsk <maciej.grabinski@nokia.com> | 2019-04-05 15:13:18 +0200 |
|---|---|---|
| committer | grabinsk <maciej.grabinski@nokia.com> | 2019-04-05 15:13:18 +0200 |
| commit | 2abfecad9aeb88ba95d62d718376535fb6e00325 (patch) | |
| tree | 58d92becb52f8882207c948975ef0fcc36c2b669 /prh-app-server/src/test | |
| parent | d7fa23e2912dd4a4a28b79bdfbb92c9b33b55f49 (diff) | |
Add pnfUrl field
Due to changes in the aai client configuration json old parameters aaiHost, aaiProtocol, aaiPort, aaiBasePath, aaiPnfPath will be replaced by pnfUrl
Change-Id: Ifd8841f8a80d743a95e3b0ea7d868eda923febca
Issue-ID: DCAEGEN2-1398
Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
Diffstat (limited to 'prh-app-server/src/test')
4 files changed, 4 insertions, 0 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 754bdba9..b09d039a 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 @@ -66,6 +66,7 @@ public class TestAppConfiguration { public static ImmutableAaiClientConfiguration createDefaultAaiClientConfiguration() { return new ImmutableAaiClientConfiguration.Builder() + .pnfUrl("https://aai.onap.svc.cluster.local:8443/aai/v12/network/pnfs/pnf") .aaiHost("aai.onap.svc.cluster.local") .aaiPort(8443) .aaiProtocol("https") diff --git a/prh-app-server/src/test/resources/correct_config.json b/prh-app-server/src/test/resources/correct_config.json index 3708b43d..9ef75122 100644 --- a/prh-app-server/src/test/resources/correct_config.json +++ b/prh-app-server/src/test/resources/correct_config.json @@ -2,6 +2,7 @@ "configs": { "aai": { "aaiClientConfiguration": { + "pnfUrl": "https://localhost:8080/aai/v11/network/pnfs/pnf", "aaiHost": "localhost", "aaiPort": 8080, "aaiIgnoreSslCertificateErrors": true, diff --git a/prh-app-server/src/test/resources/flattened_configuration.json b/prh-app-server/src/test/resources/flattened_configuration.json index 24ddb51b..3c1cc9ac 100644 --- a/prh-app-server/src/test/resources/flattened_configuration.json +++ b/prh-app-server/src/test/resources/flattened_configuration.json @@ -4,6 +4,7 @@ "dmaap.dmaapUpdateProducerConfiguration.dmaapTopicName": "/events/unauthenticated.PNF_UPDATE", "dmaap.dmaapConsumerConfiguration.timeoutMs": -1, "dmaap.dmaapConsumerConfiguration.dmaapHostName": "message-router.onap.svc.cluster.local", + "aai.aaiClientConfiguration.pnfUrl": "https://aai.onap.svc.cluster.local:8443/aai/v12/network/pnfs/pnf", "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.aaiUserPassword": "AAI", diff --git a/prh-app-server/src/test/resources/incorrect_config.json b/prh-app-server/src/test/resources/incorrect_config.json index 7d562fe6..89f72485 100644 --- a/prh-app-server/src/test/resources/incorrect_config.json +++ b/prh-app-server/src/test/resources/incorrect_config.json @@ -2,6 +2,7 @@ "configs": { "aai": { "aaiClientConfiguration": { + "pnfUrl": "https://localhost:8080/aai/v11/network/pnfs/pnf", "aaiHost": "localhost", "aaiPort": 8080, "aaiIgnoreSslCertificateErrors": true, |