diff options
| -rw-r--r-- | plans/dcaegen2-pmmapper/pmmapper/assets/config.json | 8 | ||||
| -rw-r--r-- | plans/dcaegen2-pmmapper/pmmapper/docker-compose.yml | 6 | ||||
| -rw-r--r-- | plans/dcaegen2-pmmapper/pmmapper/setup.sh | 12 |
3 files changed, 11 insertions, 15 deletions
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json index aacbb5b0..42882870 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json +++ b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json @@ -1,9 +1,9 @@ { "pm-mapper-filter": { "filters":[]}, - "key_store_path": "/opt/app/pm-mapper/etc/cert.jks.b64", - "key_store_pass_path": "/opt/app/pm-mapper/etc/jks.pass", - "trust_store_path": "/opt/app/pm-mapper/etc/trust.jks.b64", - "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass", + "key_store_path": "/opt/app/pm-mapper/etc/certs/cert.jks.b64", + "key_store_pass_path": "/opt/app/pm-mapper/etc/certs/jks.pass", + "trust_store_path": "/opt/app/pm-mapper/etc/certs/trust.jks.b64", + "trust_store_pass_path": "/opt/app/pm-mapper/etc/certs/trust.pass", "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", "dmaap_dr_feed_name": "1", "aaf_identity": "aaf_admin@people.osaaf.org", diff --git a/plans/dcaegen2-pmmapper/pmmapper/docker-compose.yml b/plans/dcaegen2-pmmapper/pmmapper/docker-compose.yml index 0843650e..c9f3e9ad 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/docker-compose.yml +++ b/plans/dcaegen2-pmmapper/pmmapper/docker-compose.yml @@ -93,9 +93,13 @@ services: pmmapper: container_name: pmmapper - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:1.1.3 + image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:latest ports: - "8081:8081" + volumes: + - /var/tmp/:/opt/app/pm-mapper/etc/certs/ + depends_on: + - datarouter-prov environment: CONFIG_BINDING_SERVICE_SERVICE_HOST: $CBS_IP CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000 diff --git a/plans/dcaegen2-pmmapper/pmmapper/setup.sh b/plans/dcaegen2-pmmapper/pmmapper/setup.sh index 4645223a..247d24d8 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/setup.sh +++ b/plans/dcaegen2-pmmapper/pmmapper/setup.sh @@ -15,7 +15,7 @@ export MARIADB_IP=172.18.0.6 export NODE_IP=172.18.0.7 export PMMAPPER_IP=172.18.0.8 -for asset in provserver.properties addSubscriber.txt addFeed3.txt node.properties cbs.json mrserver.js; do +for asset in provserver.properties addSubscriber.txt addFeed3.txt node.properties cbs.json mrserver.js cert.jks.b64 jks.pass trust.jks.b64 trust.pass; do cp $TEST_PLANS_DIR/assets/${asset} /var/tmp/ done @@ -51,14 +51,6 @@ curl 'http://'$CONSUL_IP':8500/v1/kv/pmmapper?dc=dc1' -X PUT \ docker-compose -f $TEST_PLANS_DIR/docker-compose.yml up -d pmmapper sleep 2 -# Setting up PM Mapper certs. -docker cp $TEST_PLANS_DIR/assets/cert.jks.b64 pmmapper:opt/app/pm-mapper/etc/ -docker cp $TEST_PLANS_DIR/assets/jks.pass pmmapper:opt/app/pm-mapper/etc/ -docker cp $TEST_PLANS_DIR/assets/trust.jks.b64 pmmapper:opt/app/pm-mapper/etc/ -docker cp $TEST_PLANS_DIR/assets/trust.pass pmmapper:opt/app/pm-mapper/etc/ - -docker-compose -f $TEST_PLANS_DIR/docker-compose.yml restart pmmapper - # Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb, Consul, CBS containers_ok=false for i in {1..5}; do @@ -94,8 +86,8 @@ curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DM --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1 docker cp pmmapper:/var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log /tmp/pmmapper.log -docker exec -it datarouter-prov sh -c "curl http://dmaap-dr-node:8080/internal/fetchProv" sleep 10 +docker exec -it datarouter-prov sh -c "curl http://dmaap-dr-node:8080/internal/fetchProv" curl -k https://$DR_PROV_IP:8443/internal/prov #Pass any variables required by Robot test suites in ROBOT_VARIABLES |