X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Fdcaegen2%2Fprh-testcases%2Fresources%2Fdocker-compose.yml;h=1b0c4702777fec7e8a83b077dbe65cb32feed25e;hb=fba99a52e971c0069b51a2bdce0f6cde9302f018;hp=8b6ea128843ff577b8ca7982c1a967d4068db115;hpb=918a0f524bc9727f3bc8d9abe041bb3087a3c766;p=integration%2Fcsit.git diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml index 8b6ea128..1b0c4702 100644 --- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml +++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml @@ -2,14 +2,6 @@ version: "3" services: prh: image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest - command: > - --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap-bc - --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2222 - --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap-bc - --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2222 - --aai.aaiClientConfiguration.aaiHostPortNumber=3333 - --aai.aaiClientConfiguration.aaiHost=aai - --aai.aaiClientConfiguration.aaiProtocol=http ports: - "8100:8100" - "8433:8433" @@ -19,27 +11,11 @@ services: container_name: prh depends_on: - cbs - - dmaap-bc + - dmaap-mr - aai ssl_prh: image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest - command: > - --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap-bc - --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2223 - --dmaap.dmaapConsumerConfiguration.dmaapProtocol=https - --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap-bc - --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2223 - --dmaap.dmaapProducerConfiguration.dmaapProtocol=https - --aai.aaiClientConfiguration.aaiHostPortNumber=3334 - --aai.aaiClientConfiguration.aaiHost=aai - --aai.aaiClientConfiguration.aaiProtocol=https - --security.enableAaiCertAuth=true - --security.enableDmaapCertAuth=true - --security.keyStorePath=/tmp/certs/org.onap.dcae.jks - --security.keyStorePasswordPath=/tmp/certs/keystore.password - --security.trustStorePath=/tmp/certs/org.onap.dcae.trust.jks - --security.trustStorePasswordPath=/tmp/certs/truststore.password ports: - "8200:8100" - "8533:8433" @@ -54,10 +30,10 @@ services: container_name: ssl_prh depends_on: - cbs - - dmaap-bc + - dmaap-mr - aai - dmaap-bc: + dmaap-mr: build: context: simulator dockerfile: DMaaP_simulator @@ -78,34 +54,99 @@ services: container_name: aai_simulator consul: - image: docker.io/consul:1.0.6 + image: consul:1.0.6 ports: - "8500:8500" - command: ["agent", "-bootstrap", "-client=0.0.0.0", "-server", "-config-dir=/consul/consul.d"] + 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: docker.io/consul:1.0.6 + image: consul:1.0.6 restart: on-failure - command: ["kv", "put", "-http-addr=http://consul-server:8500", "dcae-prh", '{ - "dmaap.dmaapConsumerConfiguration.dmaapHostName":"dmaap-bc", + 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.dmaapProtocol":"https", - "dmaap.dmaapProducerConfiguration.dmaapHostName":"dmaap-bc", + "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.dmaapProtocol":"https", - "aai.aaiClientConfiguration.aaiHostPortNumber":3334, + "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", - "security.enableAaiCertAuth":"true", - "security.enableDmaapCertAuth":"true", - "security.keyStorePath":"/tmp/certs/org.onap.dcae.jks", - "security.keyStorePasswordPath":"/tmp/certs/keystore.password", - "security.trustStorePath":"/tmp/certs/org.onap.dcae.trust.jks", - "security.trustStorePasswordPath":"/tmp/certs/truststore.password" + "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==" + }, + + "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" + } + } + } }' ] + container_name: consul-cfg depends_on: - consul @@ -117,3 +158,7 @@ services: - CONSUL_HOST depends_on: - consul-cfg + container_name: cbs + + +