summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-05-29 16:21:27 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-29 16:21:27 +0000
commit3071279f1b8aed0676e310f46fc3de9039b85eb0 (patch)
treee81b7ee1a09abc1d21181f198c09303dfb5b3fa9
parentf112862fa727023807bedf7bbca79563ad5ef0b2 (diff)
parentdf3a25aadc1e884d7fb1a67b4a549a519ececa81 (diff)
Merge "Fixed errors"
-rw-r--r--test/csit/plans/dcaegen2/prh_testsuites/setup.sh4
-rw-r--r--test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot4
2 files changed, 4 insertions, 4 deletions
diff --git a/test/csit/plans/dcaegen2/prh_testsuites/setup.sh b/test/csit/plans/dcaegen2/prh_testsuites/setup.sh
index 9b1dbd396..012d4c5d9 100644
--- a/test/csit/plans/dcaegen2/prh_testsuites/setup.sh
+++ b/test/csit/plans/dcaegen2/prh_testsuites/setup.sh
@@ -5,7 +5,7 @@ source ${SCRIPTS}/common_functions.sh
export PRH_SERVICE="prh"
export DMAAP_SIMULATOR="dmaap_simulator"
-cd ${WORKSPACE}/test/csit/tests/prh/testcases/resources/
+cd ${WORKSPACE}/test/csit/tests/dcaegen2/prh_testcases/resources/
docker login -u docker -p docker nexus3.onap.org:10003
docker-compose up -d
@@ -47,4 +47,4 @@ sed -i -e 's/"aaiHost":.*/"aaiHost": "'${DMAAP_SIMULATOR_IP}'",/g' ${WORKDIR}/pr
docker cp ${WORKDIR}/prh_endpoints.json prh:/config/
#Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v DMAAP_SIMULATOR:localhost:2222 -v PRH:localhost:8100" \ No newline at end of file
+ROBOT_VARIABLES="-v DMAAP_SIMULATOR:localhost:2222 -v PRH:localhost:8100"
diff --git a/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot b/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot
index bb7e3cac1..ec21b39fb 100644
--- a/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot
+++ b/test/csit/tests/dcaegen2/prh_testcases/prh_tests.robot
@@ -9,7 +9,7 @@ Library String
${PNF_REGISTER_URL} http://${DMAAP_SIMULATOR}/events/unauthenticated.SEC_OTHER_OUTPUT
${PNF_READY_URL} http://${DMAAP_SIMULATOR}/events/pnfReady
${PRH_START_URL} http://${PRH}/start
-${PNF_REGISTER_EVENT} %{WORKSPACE}/test/csit/tests/prh/testcases/resources/events/pnf_register_event.json
+${PNF_REGISTER_EVENT} %{WORKSPACE}/test/csit/tests/dcaegen2/prh_testcases/resources/events/pnf_register_event.json
*** Test Cases ***
@@ -45,4 +45,4 @@ GetCall
[Arguments] ${url}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
${resp}= Evaluate requests.get('${url}', headers=${headers}, verify=False) requests
- [Return] ${resp} \ No newline at end of file
+ [Return] ${resp}