summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpwielebs <piotr.wielebski@nokia.com>2020-02-05 15:37:24 +0100
committerpwielebs <piotr.wielebski@nokia.com>2020-02-05 15:37:24 +0100
commit844117aea297525fbfc8026bc7270d496e36941b (patch)
tree823771e791bc0c923c1af535b15e839f9e83ec2e
parent1dc0ab2d286092764a066ec648c7b6659e69153c (diff)
Update PRH documentation
Issue-ID: DCAEGEN2-2044 Signed-off-by: pwielebs <piotr.wielebski@nokia.com> Change-Id: Iaaf81033432f5968a2a45a5b0d5ddbddc7c73539
-rw-r--r--docs/sections/images/prhAlgo.pngbin44604 -> 55080 bytes
-rw-r--r--docs/sections/services/prh/configuration.rst93
2 files changed, 51 insertions, 42 deletions
diff --git a/docs/sections/images/prhAlgo.png b/docs/sections/images/prhAlgo.png
index 3d3c8093..eef3db6d 100644
--- a/docs/sections/images/prhAlgo.png
+++ b/docs/sections/images/prhAlgo.png
Binary files differ
diff --git a/docs/sections/services/prh/configuration.rst b/docs/sections/services/prh/configuration.rst
index 03110a1b..9f449cb8 100644
--- a/docs/sections/services/prh/configuration.rst
+++ b/docs/sections/services/prh/configuration.rst
@@ -6,54 +6,63 @@
Configuration
=============
-PRH fetches configuration directly from Consul service in the following JSON format:
+PRH fetches configuration directly from CBS service in the following JSON format:
.. code-block:: json
{
- "aai": {
- "aaiClientConfiguration": {
- "aaiHost": "aai.onap.svc.cluster.local",
- "aaiHostPortNumber": 8443,
- "aaiIgnoreSslCertificateErrors": true,
- "aaiProtocol": "https",
- "aaiUserName": "AAI",
- "aaiUserPassword": "AAI",
- "aaiBasePath": "/aai/v12",
- "aaiPnfPath": "/network/pnfs/pnf",
- }
- },
- "dmaap": {
- "dmaapConsumerConfiguration": {
- "consumerGroup": "OpenDCAE-c12",
- "consumerId": "c12",
- "dmaapContentType": "application/json",
- "dmaapHostName": "message-router.onap.svc.cluster.local",
- "dmaapPortNumber": 3904,
- "dmaapProtocol": "http",
- "dmaapTopicName": "/events/unauthenticated.VES_PNFREG_OUTPUT",
- "dmaapUserName": "admin",
- "dmaapUserPassword": "admin",
- "messageLimit": -1,
- "timeoutMs": -1
+ "config":{
+ "dmaap.dmaapConsumerConfiguration.dmaapUserName":"admin",
+ "dmaap.dmaapConsumerConfiguration.dmaapUserPassword":"admin",
+ "dmaap.dmaapConsumerConfiguration.consumerId":"c12",
+ "dmaap.dmaapConsumerConfiguration.consumerGroup":"OpenDCAE-c12",
+ "dmaap.dmaapConsumerConfiguration.timeoutMs":-1,
+
+ "dmaap.dmaapProducerConfiguration.dmaapUserName":"admin",
+ "dmaap.dmaapProducerConfiguration.dmaapUserPassword":"admin",
+ "dmaap.dmaapUpdateProducerConfiguration.dmaapUserName":"admin",
+ "dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword":"admin",
+ "aai.aaiClientConfiguration.pnfUrl": "https://aai.onap.svc.cluster.local:8443/aai/v12/network/pnfs/pnf",
+ "aai.aaiClientConfiguration.baseUrl": "https://aai.onap.svc.cluster.local:8443/aai/v12",
+ "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"
+ }
+ }
},
- "dmaapProducerConfiguration": {
- "dmaapContentType": "application/json",
- "dmaapHostName": "message-router.onap.svc.cluster.local",
- "dmaapPortNumber": 3904,
- "dmaapProtocol": "http",
- "dmaapTopicName": "/events/unauthenticated.PNF_READY",
- "dmaapUserName": "admin",
- "dmaapUserPassword": "admin"
+ "streams_subscribes":{
+ "ves-reg-output":{
+ "type": "message_router",
+ "dmaap_info":{
+ "topic_url":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT"
+ }
+ }
}
- },
- "security": {
- "trustStorePath": "/opt/app/prh/etc/cert/trust.jks",
- "trustStorePasswordPath": "/opt/app/prh/etc/cert/trust.pass",
- "keyStorePath": "/opt/app/prh/etc/cert/cert.jks",
- "keyStorePasswordPath": "/opt/app/prh/etc/cert/jks.pass",
- "enableAaiCertAuth": "false",
- "enableDmaapCertAuth": "false"
}
}