Refactor due to AAI model changes

Change-Id: I1684cb798b40c5d58b531549f2596582f14bc901
Issue-ID: DCAEGEN2-1533
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>

2 files changed, 1 insertions, 79 deletions

diff --git a/prh-app-server/src/test/resources/correct_config.json b/prh-app-server/src/test/resources/correct_config.json
deleted file mode 100644
index 7ec2f74c..00000000
--- a/prh-app-server/src/test/resources/correct_config.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "config":{
-    "dmaap.dmaapConsumerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT",
-    "dmaap.dmaapConsumerConfiguration.dmaapHostName":"dmaap-mr",
-    "dmaap.dmaapConsumerConfiguration.dmaapPortNumber":2223,
-    "dmaap.dmaapConsumerConfiguration.dmaapTopicName":"events/unauthenticated.VES_PNFREG_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":"dmaap-mr",
-    "dmaap.dmaapProducerConfiguration.dmaapPortNumber":2223,
-    "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:3333/aai/v12/network/pnfs/pnf",
-    "aai.aaiClientConfiguration.aaiHost":"aai",
-    "aai.aaiClientConfiguration.aaiHostPortNumber":3334,
-    "aai.aaiClientConfiguration.aaiProtocol":"https",
-    "aai.aaiClientConfiguration.aaiUserName":"DCAE",
-    "aai.aaiClientConfiguration.aaiUserPassword":"DCAE",
-    "aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors":true,
-    "aai.aaiClientConfiguration.aaiBasePath":"/aai/v12",
-    "aai.aaiClientConfiguration.aaiPnfPath":"/network/pnfs/pnf",
-    "aai.aaiClientConfiguration.aaiServiceInstancePath":"/business/customers/customer//service-subscriptions/service-subscription//service-instances/service-instance/",
-    "aai.aaiClientConfiguration.aaiHeaders":{
-      "X-FromAppId":"prh",
-      "X-TransactionId":"9999",
-      "Accept":"application/json",
-      "Real-Time":"true",
-      "Authorization":"Basic QUFJOkFBSQ=="
-    },
-    "security.trustStorePath":"change it",
-    "security.trustStorePasswordPath":"change it",
-    "security.keyStorePath":"change it",
-    "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
index 9997f583..4b846b70 100644
--- a/prh-app-server/src/test/resources/flattened_configuration.json
+++ b/prh-app-server/src/test/resources/flattened_configuration.json
@@ -29,8 +29,7 @@
     "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.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",