diff options
| author |   edepaul <paul.p.dennehy@ericsson.com> | 2018-08-29 10:43:42 +0100 |
|---|---|---|
| committer | edepaul <paul.p.dennehy@ericsson.com> | 2018-08-30 10:06:39 +0100 |
| commit | 31568800c40156e2d7c98afbe68f9f75da298026 (patch) | |
| tree | f36754123bb8e3d9038893bbe2962f784d56f2e8 | |
| parent | 2e310fe144e326f16c95e7ac5ebc9d41c78a7e48 (diff) | |
Fixing the CSIT after AAF update
Issue-ID: DMAAP-558
Change-Id: I9c74506c834e55549930e6a9acfd2e94460ade5d
Signed-off-by: edepaul <paul.p.dennehy@ericsson.com>
| -rwxr-xr-x | test/csit/plans/dmaap-datarouter/dr-suite/setup.sh | 6 | ||||
| -rwxr-xr-x | test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/csit/plans/dmaap-datarouter/dr-suite/setup.sh b/test/csit/plans/dmaap-datarouter/dr-suite/setup.sh index d72fe1f12..731779353 100755 --- a/test/csit/plans/dmaap-datarouter/dr-suite/setup.sh +++ b/test/csit/plans/dmaap-datarouter/dr-suite/setup.sh @@ -9,7 +9,7 @@ cd $WORKSPACE/archives/dmaapdr git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master cd datarouter git pull -cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-prov/src/main/resources/docker-compose/ +cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/ # start DMaaP DR containers with docker compose and configuration from docker-compose.yml docker login -u docker -p docker nexus3.onap.org:10003 @@ -37,8 +37,8 @@ echo DR_PROV_IP=${DR_PROV_IP} echo DR_NODE_IP=${DR_NODE_IP} echo DR_GATEWAY_IP=${DR_GATEWAY_IP} -docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=node.datarouternew.com\|$DR_GATEWAY_IP" -docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/PROV_AUTH_ADDRESSES?val=prov.datarouternew.com\|$DR_GATEWAY_IP" +docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$DR_GATEWAY_IP" +docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/PROV_AUTH_ADDRESSES?val=dmaap-dr-prov\|$DR_GATEWAY_IP" #Pass any variables required by Robot test suites in ROBOT_VARIABLES ROBOT_VARIABLES="-v DR_PROV_IP:${DR_PROV_IP} -v DR_NODE_IP:${DR_NODE_IP}" diff --git a/test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh b/test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh index e5a7f2527..033a00156 100755 --- a/test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh +++ b/test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh @@ -1,4 +1,4 @@ #!/bin/bash -cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-prov/src/main/resources/docker-compose/ +cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/ docker-compose down -v |