diff options
| -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 | ||||
| -rwxr-xr-x | test/csit/tests/dmaap-datarouter/dr-suite/dr-suite.robot | 8 |
3 files changed, 12 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 c1bb75967..3e02a0d74 100755 --- a/test/csit/plans/dmaap-datarouter/dr-suite/setup.sh +++ b/test/csit/plans/dmaap-datarouter/dr-suite/setup.sh @@ -12,14 +12,14 @@ git pull cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-prov/src/main/resources/docker-compose/ # start DMaaP DR containers with docker compose and configuration from docker-compose.yml -docker login -u docker -p docker nexus3.onap.org:10001 +docker login -u docker -p docker nexus3.onap.org:10003 docker-compose up -d -# Wait for initialization of Docker container for datarouter-node, datarouter-prov and mysql +# Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb for i in {1..50}; do if [ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ] && \ [ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' mysql) ] + [ $(docker inspect --format '{{ .State.Running }}' mariadb) ] then echo "DR Service Running" break diff --git a/test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh b/test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh index f3ddf4774..546bea6d6 100755 --- a/test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh +++ b/test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh @@ -2,4 +2,4 @@ kill-instance.sh datarouter-node kill-instance.sh datarouter-prov -kill-instance.sh mysql +kill-instance.sh mariadb diff --git a/test/csit/tests/dmaap-datarouter/dr-suite/dr-suite.robot b/test/csit/tests/dmaap-datarouter/dr-suite/dr-suite.robot index c966c6985..b5092f86a 100755 --- a/test/csit/tests/dmaap-datarouter/dr-suite/dr-suite.robot +++ b/test/csit/tests/dmaap-datarouter/dr-suite/dr-suite.robot @@ -70,6 +70,14 @@ Run Delete Subscription Should Be Equal As Strings ${resp.status_code} 204 log 'JSON Response Code:'${resp} +Run Delete Feed + [Documentation] Delete Feed + [Timeout] 1 minute + ${resp}= DeleteCall ${TARGET_URL_FEED} rs873m + log ${resp.text} + Should Be Equal As Strings ${resp.status_code} 204 + log 'JSON Response Code:'${resp} + *** Keywords *** PostCall [Arguments] ${url} ${data} ${content_type} ${user} |