-version: "3"
+version: "2.2"
services:
prh:
image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest
ports:
- "8100:8100"
- "8433:8433"
- environment:
- - LOG_LEVEL
- - PRH_LOG_LEVEL
- container_name: prh
- depends_on:
- - cbs
- - dmaap-mr
- - aai
-
- ssl_prh:
- image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest
- ports:
- - "8200:8100"
- - "8533:8433"
volumes:
- ./simulator/certs:/tmp/certs
environment:
- - LOG_LEVEL
- - PRH_LOG_LEVEL
- - HOSTNAME
- - CONSUL_HOST
+ - HOSTNAME=dcae-prh
+ - CONSUL_HOST # not in use, but still required by SDK - should be removed later on
- CONFIG_BINDING_SERVICE
- container_name: ssl_prh
+ - CONFIG_BINDING_SERVICE_SERVICE_PORT
+ container_name: prh
depends_on:
- - cbs
- - dmaap-mr
- - aai
+ cbs:
+ condition: service_healthy
+ dmaap-mr:
+ condition: service_started
+ aai:
+ condition: service_started
dmaap-mr:
build:
command: ["agent", "-bootstrap", "-client=0.0.0.0", "-server", "-ui", "-config-dir=/consul/consul.d"]
volumes:
- ./consul.d/:/consul/consul.d
+ container_name: consul
consul-cfg:
image: consul:1.0.6
restart: on-failure
command: ["kv", "put", "-http-addr=http://consul:8500", "dcae-prh", '{
- "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",
+ "logging.level.org.onap.dcaegen2.services.prh": "debug",
+ "logging.level.org.onap.dcaegen2.services.sdk": "debug",
"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.pnfUrl":"https://aai:3334/aai/v12/network/pnfs/pnf",
"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/${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=="
+ "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,
+ "security.trustStorePath":"/tmp/certs/truststore.jks",
+ "security.trustStorePasswordPath":"/tmp/certs/truststore.password",
+ "security.keyStorePath":"/tmp/certs/keystore.p12",
+ "security.keyStorePasswordPath":"/tmp/certs/keystore.password",
+ "security.enableAaiCertAuth":true,
+ "security.enableDmaapCertAuth":true,
"streams_publishes":{
"pnf-update":{
"type": "message_router",
"dmaap_info":{
- "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE"
+ "topic_url":"https://dmaap-mr:2223/events/unauthenticated.PNF_UPDATE"
}
},
"pnf-ready":{
"type": "message_router",
"dmaap_info":{
- "topic_url":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY"
+ "topic_url":"https://dmaap-mr:2223/events/unauthenticated.PNF_READY"
}
}
},
"ves-reg-output":{
"type": "message_router",
"dmaap_info":{
- "topic_url":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT"
+ "topic_url":"https://dmaap-mr:2223/events/unauthenticated.VES_PNFREG_OUTPUT"
}
}
}
}'
]
+ container_name: consul-cfg
+ depends_on:
+ - consul
+
+ consul-cfg-dcae-ves-collector:
+ image: consul:1.0.6
+ restart: on-failure
+ command: ["kv", "put", "-http-addr=http://consul:8500", "dcae-ves-collector",'{
+ "collector.dynamic.config.update.frequency": "5",
+ "event.transform.flag": "0",
+ "collector.schema.checkflag": "1",
+ "collector.dmaap.streamid": "fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration",
+ "collector.service.port": "8080",
+ "collector.schema.file":"{
+ \"v1\":\"./etc/CommonEventFormat_27.2.json\",
+ \"v2\":\"./etc/CommonEventFormat_27.2.json\",
+ \"v3\":\"./etc/CommonEventFormat_27.2.json\",
+ \"v4\":\"./etc/CommonEventFormat_27.2.json\",
+ \"v5\":\"./etc/CommonEventFormat_28.4.1.json\",
+ \"v7\":\"./etc/CommonEventFormat_30.0.1.json\"
+ }",
+ "collector.keystore.passwordfile": "/opt/app/VESCollector/etc/passwordfile",
+ "collector.inputQueue.maxPending": "8096",
+ "streams_publishes":{
+ "ves-measurement": {
+ "type": "message_router",
+ "dmaap_info": {
+ "topic_url": "http://dmaap-mr:2222/events/unauthenticated.VES_MEASUREMENT_OUTPUT/"
+ }
+ },
+ "ves-fault": {
+ "type": "message_router",
+ "dmaap_info": {
+ "topic_url": "http://dmaap-mr:2222/events/unauthenticated.SEC_FAULT_OUTPUT/"
+ }
+ },
+ "ves-pnfRegistration": {
+ "type": "message_router",
+ "dmaap_info": {
+ "topic_url": "http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT/"
+ }
+ },
+ "ves-other": {
+ "type": "message_router",
+ "dmaap_info": {
+ "topic_url": "http://dmaap-mr:2222/events/unauthenticated.SEC_OTHER_OUTPUT/"
+ }
+ },
+ "ves-heartbeat": {
+ "type": "message_router",
+ "dmaap_info": {
+ "topic_url": "http://dmaap-mr:2222/events/unauthenticated.SEC_HEARTBEAT_OUTPUT/"
+ }
+ },
+ "ves-notification": {
+ "type": "message_router",
+ "dmaap_info": {
+ "topic_url": "http://dmaap-mr:2222/events/unauthenticated.VES_NOTIFICATION_OUTPUT/"
+ }
+ }
+ },
+ "collector.service.secure.port": "8443",
+ "header.authflag": "0",
+ "collector.keystore.file.location": "/opt/app/VESCollector/etc/keystore",
+ "collector.keystore.alias":
+ "dynamically generated",
+ "services_calls": [],
+ "header.authlist": "sample1,c2FtcGxlMQ=="
+ }']
+ container_name: consul-cfg-dcae-ves-collector
depends_on:
- consul
+
cbs:
image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.4
ports:
- CONSUL_HOST
depends_on:
- consul-cfg
+ healthcheck:
+ test: ["CMD", "curl", "-f", "http://localhost:10000/service_component_all/dcae-prh"]
+ interval: 3s
+ timeout: 2s
+ retries: 20
+ container_name: cbs
Code Review / integration / csit.git / blobdiff