Adjust relative paths for CSIT files 01/69401/2
authorGary Wu <gary.i.wu@huawei.com>
Thu, 27 Sep 2018 18:31:33 +0000 (11:31 -0700)
committerGary Wu <gary.i.wu@huawei.com>
Thu, 27 Sep 2018 19:18:06 +0000 (12:18 -0700)
Remove leading test/csit/ from all relative paths to
accomodate the move into integration/csit repo.

Change-Id: Id9482b46df839f5eba28135e9f987a3eda1d7d94
Issue-ID: INT-671
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
148 files changed:
plans/aaf/sms-test-plan/testplan.txt
plans/aai/esr-server/testplan.txt
plans/aai/resources/testplan.txt
plans/aai/search-data-service/testplan.txt
plans/aai/traversal/testplan.txt
plans/appc/healthcheck/setup.sh
plans/appc/healthcheck/testplan.txt
plans/ccsdk/healthcheck/setup.sh
plans/ccsdk/healthcheck/testplan.txt
plans/clamp/APIs/setup.sh
plans/clamp/APIs/teardown.sh
plans/clamp/APIs/testplan.txt
plans/clamp/UIs/setup.sh
plans/clamp/UIs/teardown.sh
plans/clamp/UIs/testplan.txt
plans/cli/sanity-check/testplan.txt
plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh
plans/dcaegen2-collectors-hv-ves/testsuites/testplan.txt
plans/dcaegen2/prh-testsuites/setup.sh
plans/dcaegen2/prh-testsuites/testplan.txt
plans/dcaegen2/testsuites/setup.sh
plans/dcaegen2/testsuites/testplan.txt
plans/dmaap-buscontroller/mock_downstream/setup.sh
plans/dmaap-buscontroller/mock_downstream/testplan.txt
plans/dmaap-buscontroller/ssl/setup.sh
plans/dmaap-buscontroller/ssl/testplan.txt
plans/dmaap-buscontroller/with_dr/setup.sh
plans/dmaap-buscontroller/with_mr/setup.sh
plans/dmaap-buscontroller/with_mr/teardown.sh
plans/dmaap-buscontroller/with_mr/testplan.txt
plans/externalapi-nbi/healthcheck/setup.sh
plans/externalapi-nbi/healthcheck/teardown.sh
plans/externalapi-nbi/healthcheck/testplan.txt
plans/holmes-rule-management/sanity-check/testplan.txt
plans/integration/functionality1/setup.sh
plans/integration/functionality1/testplan.txt
plans/integration/vCPE/testplan.txt
plans/modeling-toscaparsers-javatoscachecker/APIs/setup.sh
plans/modeling-toscaparsers-javatoscachecker/APIs/teardown.sh
plans/modeling-toscaparsers-javatoscachecker/APIs/testplan.txt
plans/msb/iag-redirect-discovery/testplan.txt
plans/msb/rest-service/testplan.txt
plans/msb/sanity-check/testplan.txt
plans/msb/tcp-service/testplan.txt
plans/multicloud-ocata/functionality1/testplan.txt
plans/multicloud-ocata/hpa-discovery/setup.sh
plans/multicloud-ocata/hpa-discovery/testplan.txt
plans/multicloud-pike/functionality1/testplan.txt
plans/multicloud-pike/hpa-discovery/setup.sh
plans/multicloud-pike/hpa-discovery/testplan.txt
plans/multicloud-vmware/functionality1/testplan.txt
plans/multicloud-windriver/functionality1/testplan.txt
plans/multicloud/functionality1/testplan.txt
plans/music/music-distributed-kv-store-test-plan/testplan.txt
plans/music/music-test-plan/setup.sh
plans/music/music-test-plan/testplan.txt
plans/optf-has/has/setup.sh
plans/optf-has/has/teardown.sh
plans/optf-has/has/testplan.txt
plans/policy/apex-pdp/testplan.txt
plans/policy/distribution/testplan.txt
plans/policy/health/setup.sh
plans/policy/health/testplan.txt
plans/portal-sdk/testsuite/testplan.txt
plans/portal/testsuite/testplan.txt
plans/sdc/nightly/setup.sh
plans/sdc/nightly/teardown.sh
plans/sdc/nightly/testplan.txt
plans/sdc/sanity/setup.sh
plans/sdc/sanity/teardown.sh
plans/sdc/sanity/testplan.txt
plans/sdc/uiSanity/setup.sh
plans/sdc/uiSanity/teardown.sh
plans/sdc/uiSanity/testplan.txt
plans/sdnc/healthcheck/setup.sh
plans/sdnc/healthcheck/testplan.txt
plans/so/integration-testing/setup.sh
plans/so/integration-testing/testplan.txt
plans/usecase-ui-server/testsuite/testplan.txt
plans/usecases/5G-bulkpm/setup.sh
plans/usecases/5G-bulkpm/testplan.txt
plans/vfc-gvnfm-vnflcm/sanity-check/testplan.txt
plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt
plans/vfc-gvnfm-vnfres/sanity-check/testplan.txt
plans/vfc-nfvo-catalog/sanity-check/testplan.txt
plans/vfc-nfvo-driver-ems/sanity-check/testplan.txt
plans/vfc-nfvo-driver-sfc/sanity-check/testplan.txt
plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt
plans/vfc-nfvo-driver-vnfm-svnfm/sanity-check/testplan.txt
plans/vfc-nfvo-lcm/sanity-check/testplan.txt
plans/vfc-nfvo-multivimproxy/sanity-check/testplan.txt
plans/vfc-nfvo-resmanagement/sanity-check/testplan.txt
plans/vfc-nfvo-wfengine/sanity-check/testplan.txt
plans/vid/healthCheck/setup.sh
plans/vid/healthCheck/teardown.sh
plans/vid/healthCheck/testplan.txt
plans/vnfsdk-ice/sanity-check/testplan.txt
plans/vnfsdk-marketplace/sanity-check/testplan.txt
plans/vnfsdk-pkgtools/sanity-check/testplan.txt
plans/vnfsdk-refrepo/sanity-check/testplan.txt
plans/vvp/sanity/setup.sh
plans/vvp/sanity/teardown.sh
plans/vvp/sanity/testplan.txt
run-csit.sh
scripts/appc/script1.sh
scripts/ccsdk/script1.sh
scripts/clamp/clone_clamp_and_change_dockercompose.sh
scripts/clamp/kill_and_remove_clamp_and_db_containers.sh
scripts/clamp/start_clamp_containers.sh
scripts/cli/startup.sh
scripts/dmaap-buscontroller/.mock-aaf.sh.swp [deleted file]
scripts/dmaap-buscontroller/dmaapbc-launch.sh
scripts/dmaap-buscontroller/start-mock.sh
scripts/externalapi-nbi/delete_nbi_containers.sh
scripts/externalapi-nbi/start_nbi_containers.sh
scripts/integration/script1.sh
scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh
scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh
scripts/music/music-scripts/music_script.sh
scripts/optf-has/has/has_proxy_settings.sh
scripts/optf-has/has/has_script.sh
scripts/optf-has/has/music_script.sh
scripts/optf-has/has/simulator_script.sh
scripts/policy/script1.sh
scripts/run-instance.sh
scripts/sdc/kill_containers_and_remove_dataFolders.sh
scripts/sdc/setup_sdc_for_apis_sanity.sh
scripts/sdc/setup_sdc_for_ui_sanity.sh
scripts/sdc/start_sdc_containers.sh
scripts/sdnc/script1.sh
scripts/vid/clone_and_setup_vid_data.sh
scripts/vid/kill_containers_and_remove_dataFolders.sh
scripts/vid/start_vid_containers.sh
scripts/vvp/clone_and_setup_vvp_data.sh
scripts/vvp/kill_containers_and_remove_dataFolders.sh
scripts/vvp/start_vvp_containers.sh
tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
tests/dcaegen2-collectors-hv-ves/testcases/authorization.robot
tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py
tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot
tests/dcaegen2-collectors-hv-ves/testcases/multiple-clients.robot
tests/dcaegen2/prh-testcases/prh_tests.robot
tests/dcaegen2/testcases/dcae_ves.robot
tests/dcaegen2/testcases/resources/DcaeLibrary.py
tests/dcaegen2/testcases/resources/DcaeVariables.py
tests/dcaegen2/testcases/resources/dcae_keywords.robot
tests/dcaegen2/testcases/resources/vesc_enable_https_auth.sh
tests/usecases/5G-bulkpm/BulkpmE2E.robot

index c2b3b7b..3ac14bd 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 aaf/aaf-sms-suite
\ No newline at end of file
index 43ed23e..0592a70 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 aai/esr-server/startup
 
index 1e8902a..e0538c0 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 aai/resources/api_suite
 aai/resources/relationship_suite
index b0a72a0..02f3ea3 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 aai/search-data-service/suite1
index 9b48bf9..65603fd 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 aai/traversal/suite1
index da441ea..0ea9f92 100755 (executable)
@@ -18,7 +18,7 @@
 #
 # Place the scripts in run order:
 SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source ${WORKSPACE}/test/csit/scripts/appc/script1.sh
+source ${WORKSPACE}/scripts/appc/script1.sh
 
 export APPC_DOCKER_IMAGE_VERSION=1.4.0-SNAPSHOT-latest
 export CCSDK_DOCKER_IMAGE_VERSION=0.2-STAGING-latest
index 97d8278..c792056 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 appc/healthcheck
 appc/cdt
index bdb5b55..c073acd 100644 (file)
@@ -18,7 +18,7 @@
 #
 # Place the scripts in run order:
 SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source ${WORKSPACE}/test/csit/scripts/ccsdk/script1.sh
+source ${WORKSPACE}/scripts/ccsdk/script1.sh
 
 export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 export NEXUS_DOCKER_REPO="nexus3.onap.org:10001"
index affe635..2cd8cda 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 ccsdk/healthcheck
 
index bb7a814..6e27495 100755 (executable)
@@ -18,9 +18,9 @@
 #
 # Place the scripts in run order:
 
-source ${WORKSPACE}/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh
+source ${WORKSPACE}/scripts/clamp/clone_clamp_and_change_dockercompose.sh
 
-source ${WORKSPACE}/test/csit/scripts/clamp/start_clamp_containers.sh
+source ${WORKSPACE}/scripts/clamp/start_clamp_containers.sh
 
 # Pass any variables required by Robot test suites in ROBOT_VARIABLES
 #ROBOT_VARIABLES="-v TEST:${TEST}"
index 07067e6..0e10d77 100755 (executable)
@@ -17,6 +17,6 @@
 # Modifications copyright (c) 2017 AT&T Intellectual Property
 #
 
-source ${WORKSPACE}/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh
+source ${WORKSPACE}/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh
 
 # $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging
index 9d328f5..9891853 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 clamp/APIs
 
index bb7a814..6e27495 100755 (executable)
@@ -18,9 +18,9 @@
 #
 # Place the scripts in run order:
 
-source ${WORKSPACE}/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh
+source ${WORKSPACE}/scripts/clamp/clone_clamp_and_change_dockercompose.sh
 
-source ${WORKSPACE}/test/csit/scripts/clamp/start_clamp_containers.sh
+source ${WORKSPACE}/scripts/clamp/start_clamp_containers.sh
 
 # Pass any variables required by Robot test suites in ROBOT_VARIABLES
 #ROBOT_VARIABLES="-v TEST:${TEST}"
index 07067e6..0e10d77 100755 (executable)
@@ -17,6 +17,6 @@
 # Modifications copyright (c) 2017 AT&T Intellectual Property
 #
 
-source ${WORKSPACE}/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh
+source ${WORKSPACE}/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh
 
 # $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging
index 9ec5b95..d282425 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 clamp/UIs
 
index 477ddab..2280f8b 100644 (file)
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 cli/startup/startup_check.robot
index 6f72521..587b268 100755 (executable)
@@ -37,4 +37,4 @@ docker-compose up -d
 
 mkdir -p ${WORKSPACE}/archives/containers_logs
 
-export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries"
+export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/libraries"
index e9a7f63..7b1a333 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 dcaegen2-collectors-hv-ves/testcases
 
index 52167bf..00892d6 100644 (file)
@@ -6,7 +6,7 @@ export PRH_SERVICE="prh"
 export DMAAP_SIMULATOR="dmaap_simulator"
 export AAI_SIMULATOR="aai_simulator"
 
-cd ${WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/resources/
+cd ${WORKSPACE}/tests/dcaegen2/prh-testcases/resources/
 
 pip uninstall -y docker-py
 pip uninstall -y docker
index 9007a64..728038a 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 dcaegen2/prh-testcases
index 8ee1309..7847dce 100755 (executable)
@@ -31,7 +31,7 @@ VESC_IP=`get-instance-ip.sh vesc`
 export VESC_IP=${VESC_IP}
 export HOST_IP=${HOST_IP}
 
-export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/test/csit/tests/dcaegen2/testcases/resources"
+export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/tests/dcaegen2/testcases/resources"
 
 pip install jsonschema uuid
 # Wait container ready
index fbf0883..06810de 100755 (executable)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 dcaegen2/testcases
index d5c77b0..9f5dbbc 100755 (executable)
@@ -22,7 +22,7 @@
 
 
 # Place the scripts in run order:
-source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/start-mock.sh
+source ${WORKSPACE}/scripts/dmaap-buscontroller/start-mock.sh
 start_mock "aaf" 
 AAF_IP=${IP}
 start_mock "mrc" 3904
@@ -30,7 +30,7 @@ MRC_IP=${IP}
 start_mock "drps" 
 DRPS_IP=${IP}
 
-source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
+source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
 dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
 DMAAPBC_IP=${IP}
 
@@ -41,5 +41,5 @@ echo "AAF_IP=$AAF_IP MRC_IP=$MRC_IP DRPS_IP=$DRPS_IP DMAAPBC_IP=$DMAAPBC_IP"
 ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
 
 set -x
-${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP}
+${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP}
 set +x
index 39a2f44..484fb29 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 dmaap-buscontroller/suite1
 
index e40f62d..6ab50ed 100755 (executable)
@@ -22,7 +22,7 @@
 
 
 # Place the scripts in run order:
-source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/start-mock.sh
+source ${WORKSPACE}/scripts/dmaap-buscontroller/start-mock.sh
 start_mock "aaf" 
 AAF_IP=${IP}
 start_mock "mrc" 3905
@@ -30,7 +30,7 @@ MRC_IP=${IP}
 start_mock "drps" 8443
 DRPS_IP=${IP}
 
-source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
+source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
 dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
 DMAAPBC_IP=${IP}
 
@@ -41,5 +41,5 @@ echo "AAF_IP=$AAF_IP MRC_IP=$MRC_IP DRPS_IP=$DRPS_IP DMAAPBC_IP=$DMAAPBC_IP"
 ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
 
 set -x
-${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP} https
+${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP} https
 set +x
index e106e7b..54ce4df 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 dmaap-buscontroller/ssl_suite
 
index 7cefa72..d9d8574 100755 (executable)
@@ -29,11 +29,11 @@ then
 else
 
        # Place the scripts in run order:
-       source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dr-launch.sh
+       source ${WORKSPACE}/scripts/dmaap-buscontroller/dr-launch.sh
        dmaap_dr_launch
        DRPS_IP=${IP}
 
-       #source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/start-mock.sh
+       #source ${WORKSPACE}/scripts/dmaap-buscontroller/start-mock.sh
        #start_mock "aaf" 
        #AAF_IP=${IP}
        AAF_IP=0.0.0.0
@@ -41,7 +41,7 @@ else
        #DRPS_IP=${IP}
        MRC_IP=0.0.0.0
 
-       source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
+       source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
        dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
        DMAAPBC_IP=${IP}
 
@@ -51,7 +51,7 @@ else
        # Pass any variables required by Robot test suites in ROBOT_VARIABLES
        ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
        set -x
-       ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP} https
+       ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP} https
        set +x
 fi
 
index bcd19b5..0163686 100755 (executable)
@@ -26,11 +26,11 @@ then
 else
 
        # Place the scripts in run order:
-       source ${WORKSPACE}/test/csit/scripts/dmaap-message-router/dmaap-mr-launch.sh
+       source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-launch.sh
        dmaap_mr_launch
        MRC_IP=${IP}
 
-       source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/start-mock.sh
+       source ${WORKSPACE}/scripts/dmaap-buscontroller/start-mock.sh
        start_mock "aaf" 
        AAF_IP=${IP}
        #AAF_IP=0.0.0.0
@@ -38,7 +38,7 @@ else
        #DRPS_IP=${IP}
        DRPS_IP=0.0.0.0
 
-       source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
+       source ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
        dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
        DMAAPBC_IP=${IP}
 
@@ -48,7 +48,7 @@ else
        # Pass any variables required by Robot test suites in ROBOT_VARIABLES
        ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
        set -x
-       ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP}
+       ${WORKSPACE}/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP}
        set +x
 fi
 
index 3feebe0..ae06481 100644 (file)
@@ -19,7 +19,7 @@
 # ============LICENSE_END=========================================================
 # 
 #
-source ${WORKSPACE}/test/csit/scripts/dmaap-message-router/dmaap-mr-teardown.sh
+source ${WORKSPACE}/scripts/dmaap-message-router/dmaap-mr-teardown.sh
 
 if [ "$KEEP_DMAAP" != "Y" ]
 then
index 4f4ff71..0728bd4 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 dmaap-buscontroller/single-mr-suite
index 50da7ad..f292a13 100644 (file)
@@ -14,4 +14,4 @@
 # limitations under the License.
 # ========================================================================
 
-source ${WORKSPACE}/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh
+source ${WORKSPACE}/scripts/externalapi-nbi/start_nbi_containers.sh
index 8392972..fcca23e 100644 (file)
@@ -14,4 +14,4 @@
 # limitations under the License.
 # ========================================================================
 
-source ${WORKSPACE}/test/csit/scripts/externalapi-nbi/delete_nbi_containers.sh
\ No newline at end of file
+source ${WORKSPACE}/scripts/externalapi-nbi/delete_nbi_containers.sh
\ No newline at end of file
index 06622ae..8339c3c 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 externalapi-nbi/healthcheck
index e699512..cc12b3f 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 
 holmes/testcase/EngineMgt
index c18f622..3da509f 100755 (executable)
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 # Place the scripts in run order:
-source ${WORKSPACE}/test/csit/scripts/integration/script1.sh
+source ${WORKSPACE}/scripts/integration/script1.sh
 
 docker run --name i-mock -d jamesdbloom/mockserver
 MOCK_IP=`get-instance-ip.sh i-mock`
@@ -27,7 +27,7 @@ for i in {1..10}; do
     sleep $i
 done
 
-${WORKSPACE}/test/csit/scripts/integration/mock-hello.sh ${MOCK_IP}
+${WORKSPACE}/scripts/integration/mock-hello.sh ${MOCK_IP}
 
 # Pass any variables required by Robot test suites in ROBOT_VARIABLES
 ROBOT_VARIABLES="-v MOCK_IP:${MOCK_IP}"
index 9221b47..e35e1cc 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 # Temporary change to trigger verify job.
 integration/suite1
index 2b3d4ad..4c8688e 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 integration/vCPE
index 03d07de..43e172a 100644 (file)
@@ -18,5 +18,5 @@
 #
 # Place the scripts in run order:
 
-source ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh
+source ${WORKSPACE}/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh
 
index 1ecaad4..a4ba8eb 100644 (file)
@@ -17,5 +17,5 @@
 # Modifications copyright (c) 2017 AT&T Intellectual Property
 #
 
-source ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh
+source ${WORKSPACE}/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh
 
index f59237b..5a91725 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 modeling-toscaparsers-javatoscachecker/APIs
index 54bb307..0f80703 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 msb/rest-service-discovery
 msb/rest-service-api-gateway
\ No newline at end of file
index 54bb307..0f80703 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 msb/rest-service-discovery
 msb/rest-service-api-gateway
\ No newline at end of file
index 0ef7507..c0067bb 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 msb/startup
index ba8f6f2..a18c357 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 msb/tcp-service-discovery
 msb/tcp-service-access
\ No newline at end of file
index fcd795d..a8bd6c4 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 multicloud-ocata/provision/sanity_test_multicloud.robot
index d17bec1..cc494e8 100644 (file)
@@ -17,8 +17,8 @@ cd ${SCRIPTS}
 
 source common_functions.sh
 
-generic_sim_path=${WORKSPACE}/test/csit/scripts/multicloud-ocata/generic_sim
-multicloud_provision_path=${WORKSPACE}/test/csit/tests/multicloud-ocata/provision
+generic_sim_path=${WORKSPACE}/scripts/multicloud-ocata/generic_sim
+multicloud_provision_path=${WORKSPACE}/tests/multicloud-ocata/provision
 # start generic simulator for openstack mock and AAI mock
 if [[ -z $(docker images -q generic_sim) ]]; then
     pushd $generic_sim_path
index 9394379..d03e80b 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 multicloud-ocata/provision/hpa_multicloud.robot
index 7f46016..a2b9ab7 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 multicloud-pike/provision/sanity_test_multicloud.robot
index cbcc302..7312113 100644 (file)
@@ -17,8 +17,8 @@ cd ${SCRIPTS}
 
 source common_functions.sh
 
-generic_sim_path=${WORKSPACE}/test/csit/scripts/multicloud-pike/generic_sim
-multicloud_provision_path=${WORKSPACE}/test/csit/tests/multicloud-pike/provision
+generic_sim_path=${WORKSPACE}/scripts/multicloud-pike/generic_sim
+multicloud_provision_path=${WORKSPACE}/tests/multicloud-pike/provision
 # start generic simulator for openstack mock and AAI mock
 if [[ -z $(docker images -q generic_sim) ]]; then
     pushd $generic_sim_path
index 5914cbb..4a71d55 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 multicloud-pike/provision/hpa_multicloud.robot
index 0a2ad45..bb9097b 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 multicloud-vmware/provision/sanity_test_vio.robot
 multicloud-vmware/provision/sanity_test_tenant.robot
index e59320b..c4f513e 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 multicloud-windriver/provision/sanity_test_multicloud.robot
index f515c64..2daea3d 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 multicloud/provision/sanity_test_multivim.robot
index ac37bc5..654f078 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 music/music-distributed-kv-store-suite
\ No newline at end of file
index 7775bc5..f8d950e 100755 (executable)
@@ -19,7 +19,7 @@
 # add here eventual scripts needed for music
 #
 echo "########## music scripts calling ##########";
-source ${WORKSPACE}/test/csit/scripts/music/music-scripts/music_script.sh
+source ${WORKSPACE}/scripts/music/music-scripts/music_script.sh
 
 #
 # add here all the configuration steps eventually needed to be carried out for music CSIT testing
@@ -35,10 +35,10 @@ TT=10
 WORK_DIR=/tmp/music
 CASS_USERNAME=nelson24
 CASS_PASSWORD=winman123
-MUSIC_SOURCE_PROPERTIES=${WORKSPACE}/test/csit/scripts/music/music-properties
+MUSIC_SOURCE_PROPERTIES=${WORKSPACE}/scripts/music/music-properties
 MUSIC_PROPERTIES=/tmp/music/properties
 MUSIC_LOGS=/tmp/music/logs
-CQL_FILES=${WORKSPACE}/test/csit/scripts/music/cql
+CQL_FILES=${WORKSPACE}/scripts/music/cql
 MUSIC_TRIGGER_DIR=/tmp/triggers
 TRIGGER_JAR=musictrigger-0.1.0.jar
 TRIGGER_JAR_URL=https://nexus.onap.org/service/local/repositories/autorelease-72298/content/org/onap/music/musictrigger/0.1.0/musictrigger-0.1.0.jar
@@ -70,7 +70,7 @@ ${CASS_IMG};
 
 CASSA_IP=`docker inspect -f '{{ $network := index .NetworkSettings.Networks "music-net" }}{{ $network.IPAddress}}' music-db`
 echo "CASSANDRA_IP=${CASSA_IP}"
-${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${CASSA_IP} 9042
+${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${CASSA_IP} 9042
 
 # See if cassandra is up.
 echo "########## Running Test to see if Cassandra is up ##########"
@@ -122,7 +122,7 @@ docker network connect bridge music-tomcat;
 TOMCAT_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat`
 echo "TOMCAT_IP=${TOMCAT_IP}"
 
-${WORKSPACE}/test/csit/scripts/music/music-scripts/wait_for_port.sh ${TOMCAT_IP} 8080
+${WORKSPACE}/scripts/music/music-scripts/wait_for_port.sh ${TOMCAT_IP} 8080
 
 sleep 20;
 echo "########## TOMCAT Logs ##########"
index e53f326..0f9298e 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 music/music-suite
index a0bef71..6f0e883 100755 (executable)
 # add here eventual scripts needed for music
 #
 echo "# music scripts calling";
-source ${WORKSPACE}/test/csit/scripts/optf-has/has/music_script.sh
+source ${WORKSPACE}/scripts/optf-has/has/music_script.sh
 
 
 #
 echo "# simulator scripts calling";
-source ${WORKSPACE}/test/csit/scripts/optf-has/has/simulator_script.sh
+source ${WORKSPACE}/scripts/optf-has/has/simulator_script.sh
 
 # add here eventual scripts needed for optf/has
 #
 echo "# optf/has scripts calling";
-source ${WORKSPACE}/test/csit/scripts/optf-has/has/has_script.sh
+source ${WORKSPACE}/scripts/optf-has/has/has_script.sh
 
 #
 # add here below the start of all docker containers needed for optf/has CSIT testing
index 41d7aff..934d0e6 100755 (executable)
 # optf/has scripts docker containers killing";
 #
 echo "# optf/has has scripts calling";
-source ${WORKSPACE}/test/csit/scripts/optf-has/has/has_teardown_script.sh
+source ${WORKSPACE}/scripts/optf-has/has/has_teardown_script.sh
 
 echo "# optf/has simulator scripts calling";
-source ${WORKSPACE}/test/csit/scripts/optf-has/has/simulator_teardown_script.sh
+source ${WORKSPACE}/scripts/optf-has/has/simulator_teardown_script.sh
 
 echo "# optf/has music scripts calling";
-source ${WORKSPACE}/test/csit/scripts/optf-has/has/music_teardown_script.sh
+source ${WORKSPACE}/scripts/optf-has/has/music_teardown_script.sh
 
index 980050c..bf92270 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 optf-has/has
index cee9abd..07096cf 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 policy/apex-pdp/apex-pdp-test.robot
index 6f74cce..bfd8192 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 policy/distribution/distribution-test.robot
index 21f58eb..890df9b 100755 (executable)
@@ -30,9 +30,9 @@ for i in {1..10}; do
     sleep $i
 done
 
-${WORKSPACE}/test/csit/scripts/policy/mock-hello.sh ${MOCK_IP}
+${WORKSPACE}/scripts/policy/mock-hello.sh ${MOCK_IP}
 
-source ${WORKSPACE}/test/csit/scripts/policy/script1.sh
+source ${WORKSPACE}/scripts/policy/script1.sh
 
 # Pass any variables required by Robot test suites in ROBOT_VARIABLES
 ROBOT_VARIABLES="-v MOCK_IP:${MOCK_IP} -v IP:${IP} -v POLICY_IP:${POLICY_IP} -v PDP_IP:${PDP_IP} -v DOCKER_IP:${DOCKER_IP}" 
index bb85874..ab8a5b0 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 policy/suite1
index 27f8af3..75e5af0 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 portal-sdk/testsuites
index d7b18a5..a2d396a 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 portal/testsuites
index a7bbaa8..ff310a5 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ${WORKSPACE}/test/csit/scripts/sdc/setup_sdc_for_apis_sanity.sh
+source ${WORKSPACE}/scripts/sdc/setup_sdc_for_apis_sanity.sh
 
 BE_IP=`get-instance-ip.sh sdc-BE`
 echo BE_IP=${BE_IP}
index 2074d10..6e99c46 100644 (file)
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-source ${WORKSPACE}/test/csit/scripts/sdc/kill_containers_and_remove_dataFolders.sh
+source ${WORKSPACE}/scripts/sdc/kill_containers_and_remove_dataFolders.sh
index 3011ad5..83a6d9f 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 sdc/nightly
index a7bbaa8..ff310a5 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ${WORKSPACE}/test/csit/scripts/sdc/setup_sdc_for_apis_sanity.sh
+source ${WORKSPACE}/scripts/sdc/setup_sdc_for_apis_sanity.sh
 
 BE_IP=`get-instance-ip.sh sdc-BE`
 echo BE_IP=${BE_IP}
index 2074d10..6e99c46 100644 (file)
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-source ${WORKSPACE}/test/csit/scripts/sdc/kill_containers_and_remove_dataFolders.sh
+source ${WORKSPACE}/scripts/sdc/kill_containers_and_remove_dataFolders.sh
index 801f37d..9f21c69 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 sdc/sanity
index 8f2bafd..0a8d56c 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source ${WORKSPACE}/test/csit/scripts/sdc/setup_sdc_for_ui_sanity.sh
+source ${WORKSPACE}/scripts/sdc/setup_sdc_for_ui_sanity.sh
 
 BE_IP=`get-instance-ip.sh sdc-BE`
 echo BE_IP=${BE_IP}
index 2074d10..6e99c46 100644 (file)
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-source ${WORKSPACE}/test/csit/scripts/sdc/kill_containers_and_remove_dataFolders.sh
+source ${WORKSPACE}/scripts/sdc/kill_containers_and_remove_dataFolders.sh
index 801f37d..9f21c69 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 sdc/sanity
index 991ba18..dfbd32c 100644 (file)
@@ -18,7 +18,7 @@
 #
 # Place the scripts in run order:
 SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source ${WORKSPACE}/test/csit/scripts/sdnc/script1.sh
+source ${WORKSPACE}/scripts/sdnc/script1.sh
 
 export NEXUS_USERNAME=docker
 export NEXUS_PASSWD=docker
index 3fa8dde..789104a 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 sdnc/healthcheck
 
index cd0cbdc..02c21f6 100644 (file)
 # Start all process required for executing test case
 
 #start mariadb
-docker run -d --name mariadb -h db.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password -p 3306:3306 -v ${WORKSPACE}/test/csit/scripts/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d  -v ${WORKSPACE}/test/csit/scripts/mariadb/conf.d:/etc/mysql/conf.d nexus3.onap.org:10001/mariadb
+docker run -d --name mariadb -h db.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password -p 3306:3306 -v ${WORKSPACE}/scripts/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d  -v ${WORKSPACE}/scripts/mariadb/conf.d:/etc/mysql/conf.d nexus3.onap.org:10001/mariadb
 
 #start so
-docker run -d --name so -h mso.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password --link=mariadb:db.mso.testlab.openecomp.org -p 8080:8080 -v ${WORKSPACE}/test/csit/scripts/so/chef-config:/shared nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest
+docker run -d --name so -h mso.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password --link=mariadb:db.mso.testlab.openecomp.org -p 8080:8080 -v ${WORKSPACE}/scripts/so/chef-config:/shared nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest
 
 
 SO_IP=`get-instance-ip.sh so`
index 761c75c..ed3ab5a 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 so/sanity-check/sanity_test_so.robot
\ No newline at end of file
index ec7f200..af74191 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 usecase-ui/server/test.robot
index f27bfba..796b171 100644 (file)
@@ -57,7 +57,7 @@ git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master
 cd datarouter
 cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/
 rm -rf docker-compose.yml
-cp $WORKSPACE/test/csit/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/docker-compose.yml
+cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/docker-compose.yml
 docker login -u docker -p docker nexus3.onap.org:10001
 docker-compose up -d
 docker kill datarouter-prov
@@ -121,7 +121,7 @@ pip install jsonschema uuid
 sleep 2
 
 # Data File Collector configuration :
-cp $WORKSPACE/test/csit/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json /tmp/
+cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json /tmp/
 sed -i 's/dmaapmrhost/'${DMAAP_MR_IP}'/g' /tmp/datafile_endpoints.json
 sed -i 's/dmaapdrhost/'${DR_PROV_IP}'/g' /tmp/datafile_endpoints.json
 docker cp /tmp/datafile_endpoints.json dfc:/config/
@@ -129,13 +129,13 @@ docker restart dfc
 
 # SFTP Configuration:
 # Update the File Ready Notification with actual sftp ip address and copy pm files to sftp server.
-cp $WORKSPACE/test/csit/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json $WORKSPACE/test/csit/tests/usecases/5G-bulkpm-bulkpm/testcases/assets/json_events/FileExistNotificationUpdated.json
-sed -i 's/sftpserver/'${SFTP_IP}'/g' $WORKSPACE/test/csit/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json
-docker cp $WORKSPACE/test/csit/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz sftp:/home/admin/
+cp $WORKSPACE/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json $WORKSPACE/tests/usecases/5G-bulkpm-bulkpm/testcases/assets/json_events/FileExistNotificationUpdated.json
+sed -i 's/sftpserver/'${SFTP_IP}'/g' $WORKSPACE/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json
+docker cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz sftp:/home/admin/
 
 # Data Router Configuration:
 # Create default feed and create file consumer subscriber on data router
-curl -v -X POST -H "Content-Type:application/vnd.att-dr.feed" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" --data-ascii @$WORKSPACE/test/csit/plans/usecases/5G-bulkpm/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443
-cp $WORKSPACE/test/csit/plans/usecases/5G-bulkpm/assets/addSubscriber.json /tmp/addSubscriber.json
+curl -v -X POST -H "Content-Type:application/vnd.att-dr.feed" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" --data-ascii @$WORKSPACE/plans/usecases/5G-bulkpm/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443
+cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/addSubscriber.json /tmp/addSubscriber.json
 sed -i 's/fileconsumer/'${DR_SUBSCIBER_IP}'/g' /tmp/addSubscriber.json
 curl -v -X POST -H "Content-Type:application/vnd.att-dr.subscription" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" --data-ascii @/tmp/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1ii @/tmp/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1
\ No newline at end of file
index c4e1c42..feeffcc 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 usecases/5G-bulkpm
index 0aa2e3e..6627c58 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 vfc/gvnfm-vnflcm/test.robot
index 960f732..c90cc93 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 vfc/gvnfm-vnfmgr/test.robot
index e94e294..ac51e67 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 vfc/gvnfm-vnfres/test.robot
index 6c8c54a..3c5f813 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 vfc/nfvo-catalog/test.robot
index 747f868..cb2a802 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 vfc/nfvo-driver-ems/test.robot
index 9de2acc..3fa996f 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 vfc/nfvo-driver-sfc/test.robot
index e7bee51..a54f095 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 
 vfc/nfvo-driver-gvnfm/gvnfmdriver.robot
index 7eb861e..08317f7 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 
 vfc/nfvo-driver-svnfm/ztevmanager.robot
index fc261e1..2e0a32d 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 vfc/nfvo-lcm/test.robot
index f81be8e..5d1c6e9 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 vfc/nfvo-multivimproxy/test.robot
\ No newline at end of file
index 98dac63..ae6d3a5 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 vfc/nfvo-resmanagement/test.robot
\ No newline at end of file
index ff9f4d5..2d03683 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 
 vfc/nfvo-wfengine/workflow.robot
\ No newline at end of file
index ce308cf..a0ed226 100644 (file)
@@ -21,9 +21,9 @@
 /usr/bin/Xvfb :0 -screen 0 1024x768x24&
 export DISPLAY=:0
 
-source ${WORKSPACE}/test/csit/scripts/vid/clone_and_setup_vid_data.sh
+source ${WORKSPACE}/scripts/vid/clone_and_setup_vid_data.sh
 
-source ${WORKSPACE}/test/csit/scripts/vid/start_vid_containers.sh
+source ${WORKSPACE}/scripts/vid/start_vid_containers.sh
 
 
 BE_IP=`get-instance-ip.sh vid-server`
index e82ef30..0138317 100644 (file)
@@ -17,6 +17,6 @@
 # Modifications copyright (c) 2017 AT&T Intellectual Property
 #
 
-source ${WORKSPACE}/test/csit/scripts/vid/kill_containers_and_remove_dataFolders.sh
+source ${WORKSPACE}/scripts/vid/kill_containers_and_remove_dataFolders.sh
 
 # $WORKSPACE/archives/clamp-clone deleted with archives folder when tests starts so we keep it at the end for debugging
index 92d8b05..cb5e279 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 vid/healthCheck
 vid/login
index c84eb03..a18db18 100644 (file)
@@ -1,3 +1,3 @@
-## Test suites are relative paths under [integration.git]/test/csit/tests/.
+## Test suites are relative paths under [integration/csit.git]/tests/.
 ## Place the suites in run order.
 vnfsdk-ice/ice-server/validation_test.robot
index 730df01..b5370f3 100644 (file)
@@ -1,3 +1,3 @@
-## Test suites are relative paths under [integration.git]/test/csit/tests/.
+## Test suites are relative paths under [integration/csit.git]/tests/.
 ## Place the suites in run order.
 vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot
index 05ff05a..8617c20 100644 (file)
@@ -1,4 +1,4 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 vnfsdk-pkgtools/tosca-metadata/create_open.robot
 vnfsdk-pkgtools/tosca-metadata/create_validate_digest_signing.robot
index 730df01..b5370f3 100644 (file)
@@ -1,3 +1,3 @@
-## Test suites are relative paths under [integration.git]/test/csit/tests/.
+## Test suites are relative paths under [integration/csit.git]/tests/.
 ## Place the suites in run order.
 vnfsdk-marketplace/provision/sanity_test_vnfsdktestfunction.robot
index cab074c..12bb601 100644 (file)
 # Place the scripts in run order:
 
 
-source ${WORKSPACE}/test/csit/scripts/vvp/clone_and_setup_vvp_data.sh
+source ${WORKSPACE}/scripts/vvp/clone_and_setup_vvp_data.sh
 
-source ${WORKSPACE}/test/csit/scripts/vvp/start_vvp_containers.sh
+source ${WORKSPACE}/scripts/vvp/start_vvp_containers.sh
 
-source ${WORKSPACE}/test/csit/scripts/vvp/docker_health.sh
+source ${WORKSPACE}/scripts/vvp/docker_health.sh
 
-source ${WORKSPACE}/test/csit/scripts/vvp/start_vvp_sanity.sh
+source ${WORKSPACE}/scripts/vvp/start_vvp_sanity.sh
 
 
-VVP_IP=`${WORKSPACE}/test/csit/scripts/get-instance-ip.sh vvp-engagementmgr`
+VVP_IP=`${WORKSPACE}/scripts/get-instance-ip.sh vvp-engagementmgr`
 echo VVP_IP=${VVP_IP}
 
 
index b0f33a6..3369c02 100644 (file)
@@ -17,4 +17,4 @@
 # Modifications copyright (c) 2017 AT&T Intellectual Property
 #
 
-source ${WORKSPACE}/test/csit/scripts/vvp/kill_containers_and_remove_dataFolders.sh
+source ${WORKSPACE}/scripts/vvp/kill_containers_and_remove_dataFolders.sh
index 0acb508..4957ef6 100644 (file)
@@ -1,3 +1,3 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Test suites are relative paths under [integration/csit.git]/tests/.
 # Place the suites in run order.
 vvp/sanity
index 40cd9ee..9b744db 100755 (executable)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # Copyright 2016-2017 Huawei Technologies Co., Ltd.
 #
@@ -60,10 +60,10 @@ fi
 rm -rf $WORKSPACE/archives
 mkdir -p $WORKSPACE/archives
 
-if [ -f ${WORKSPACE}/test/csit/${1}/testplan.txt ]; then
+if [ -f ${WORKSPACE}/${1}/testplan.txt ]; then
     export TESTPLAN="${1}"
 else
-    echo "testplan not found: ${WORKSPACE}/test/csit/${TESTPLAN}/testplan.txt"
+    echo "testplan not found: ${WORKSPACE}/${TESTPLAN}/testplan.txt"
     exit 2
 fi
 
@@ -71,7 +71,7 @@ fi
 export TESTOPTIONS="${2}"
 
 if [ -z "$3" ]; then
-    CI=${WORKSPACE}/../ci-management
+    CI=${WORKSPACE}/../../ci-management
 else
     CI=${3}
 fi
@@ -79,18 +79,16 @@ fi
 
 
 
-TESTPLANDIR=${WORKSPACE}/test/csit/${TESTPLAN}
+TESTPLANDIR=${WORKSPACE}/${TESTPLAN}
 
 # Assume that if ROBOT_VENV is set, we don't need to reinstall robot
 if [ -f ${WORKSPACE}/env.properties ]; then
     source ${WORKSPACE}/env.properties
-    source ${ROBOT_VENV}/bin/activate
 fi
-if ! type pybot > /dev/null; then
-    rm -f ${WORKSPACE}/env.properties
-    source $CI/jjb/integration/include-raw-integration-install-robotframework.sh
-    source ${WORKSPACE}/env.properties
+if [ -f ${ROBOT_VENV}/bin/activate ]; then
     source ${ROBOT_VENV}/bin/activate
+else
+    source $CI/jjb/integration/include-raw-integration-install-robotframework.sh
 fi
 
 # install required Robot libraries
@@ -124,8 +122,8 @@ set -x
 
 
 # Add csit scripts to PATH
-export PATH=${PATH}:${WORKSPACE}/test/csit/docker/scripts:${WORKSPACE}/test/csit/scripts:${ROBOT_VENV}/bin
-export SCRIPTS=${WORKSPACE}/test/csit/scripts
+export PATH=${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT_VENV}/bin
+export SCRIPTS=${WORKSPACE}/scripts
 export ROBOT_VARIABLES=
 
 # Sign in to nexus3 docker repo
@@ -145,7 +143,7 @@ docker_stats | tee $WORKSPACE/archives/_sysinfo-1-after-setup.txt
 # Run test plan
 cd $WORKDIR
 echo "Reading the testplan:"
-cat ${TESTPLANDIR}/testplan.txt | egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' | sed "s|^|${WORKSPACE}/test/csit/tests/|" > testplan.txt
+cat ${TESTPLANDIR}/testplan.txt | egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' | sed "s|^|${WORKSPACE}/tests/|" > testplan.txt
 cat testplan.txt
 SUITES=$( xargs -a testplan.txt )
 
index 1c3d92e..1b41a12 100755 (executable)
@@ -17,4 +17,4 @@
 # Modifications copyright (c) 2017 AT&T Intellectual Property
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/appc/script1.sh"
+echo "This is ${WORKSPACE}/scripts/appc/script1.sh"
index bb583f8..223479e 100644 (file)
@@ -17,4 +17,4 @@
 # Modifications copyright (c) 2017 AT&T Intellectual Property
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/ccsdk/script1.sh"
+echo "This is ${WORKSPACE}/scripts/ccsdk/script1.sh"
index e564e63..c2c0de4 100755 (executable)
@@ -22,7 +22,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh"
+echo "This is ${WORKSPACE}/scripts/clamp/clone_clamp_and_change_dockercompose.sh"
 
 firefox --version
 which firefox
index c94a40b..31eb756 100755 (executable)
@@ -17,7 +17,7 @@
 # Modifications copyright (c) 2017 AT&T Intellectual Property
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh"
+echo "This is ${WORKSPACE}/scripts/clamp/kill_and_remove_clamp_and_db_containers.sh"
 
 kill-instance.sh clamp_clamp_1
 kill-instance.sh clamp_db_1
index 23b1705..8a176fb 100755 (executable)
@@ -22,7 +22,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/clamp/start_clamp_containers.sh"
+echo "This is ${WORKSPACE}/scripts/clamp/start_clamp_containers.sh"
 
 # start Clamp and MariaDB containers with docker compose and configuration from clamp/extra/docker/clamp/docker-compose.yml
 docker-compose up -d
index 6e29a0e..243d358 100644 (file)
@@ -15,4 +15,4 @@
 # limitations under the License.
 #
 # $1 nickname for the MSB instance
-echo "This is ${WORKSPACE}/test/csit/scripts/cli/startup.sh"
+echo "This is ${WORKSPACE}/scripts/cli/startup.sh"
diff --git a/scripts/dmaap-buscontroller/.mock-aaf.sh.swp b/scripts/dmaap-buscontroller/.mock-aaf.sh.swp
deleted file mode 100644 (file)
index edadfe9..0000000
Binary files a/scripts/dmaap-buscontroller/.mock-aaf.sh.swp and /dev/null differ
index 317c17f..079b664 100755 (executable)
@@ -8,7 +8,7 @@ function dmaapbc_launch() {
        CONTAINER_NAME=dmaapbc
        IP=""
 
-       cd ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller
+       cd ${WORKSPACE}/scripts/dmaap-buscontroller
 
        TMP_CFG=/tmp/docker-databus-controller.conf
        . ./onapCSIT.env > $TMP_CFG
index b4707c5..d50125a 100755 (executable)
@@ -39,7 +39,7 @@ function start_mock() {
        done
 
        set -x
-       ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/init-mock-${app}.sh ${IP}
+       ${WORKSPACE}/scripts/dmaap-buscontroller/init-mock-${app}.sh ${IP}
        set +x
 
        # this is the output of this function   
index 76be328..bc0d8b0 100644 (file)
@@ -14,7 +14,7 @@
 # limitations under the License.
 # ========================================================================
 
-echo "This is ${WORKSPACE}/test/csit/scripts/externalapi-nbi/delete_nbi_containers.sh"
+echo "This is ${WORKSPACE}/scripts/externalapi-nbi/delete_nbi_containers.sh"
 
 # Check if docker-compose file exists
 if [ ! -f "$WORKSPACE/externalapi-nbi/docker-compose.yml" ]; then
index 68fbb02..69007f2 100644 (file)
@@ -19,7 +19,7 @@ NEXUS_PASSWD=docker
 export NEXUS_DOCKER_REPO=nexus3.onap.org:10001
 export DOCKER_IMAGE_VERSION=latest
 
-echo "This is ${WORKSPACE}/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh"
+echo "This is ${WORKSPACE}/scripts/externalapi-nbi/start_nbi_containers.sh"
 
 # Create directory
 mkdir -p $WORKSPACE/externalapi-nbi
index 05d57e8..4c8921a 100755 (executable)
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-echo "This is ${WORKSPACE}/test/csit/scripts/integration/script1.sh"
+echo "This is ${WORKSPACE}/scripts/integration/script1.sh"
index 3521ff1..d11c9e8 100644 (file)
@@ -20,7 +20,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh"
+echo "This is ${WORKSPACE}/scripts/modeling-toscaparsers-javatoscachecker/setup_containers.sh"
 
 #start docker image
 run-instance.sh nexus3.onap.org:10001/onap/modeling/javatoscachecker:latest modeling_javatoscachecker_1 "-p 8080:8080"
index cca4fe1..aa82cf2 100644 (file)
@@ -20,7 +20,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh"
+echo "This is ${WORKSPACE}/scripts/modeling-toscaparsers-javatoscachecker/teardown_containers.sh"
 
 kill-instance.sh modeling_javatoscachecker_1
 
index f16062a..172ca5b 100755 (executable)
@@ -16,7 +16,7 @@
 #
 echo "######################################################################"
 echo "### "
-echo "### This is ${WORKSPACE}/test/csit/scripts/music/music-scripts/music_script.sh"
+echo "### This is ${WORKSPACE}/scripts/music/music-scripts/music_script.sh"
 echo "### "
 echo "######################################################################"
 #
index 92f8d93..4809610 100755 (executable)
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 # put into this file local proxy settings in case they are needed on your local environment
-echo "### This is ${WORKSPACE}/test/csit/scripts/optf-has/has/has_proxy_settings.sh"
+echo "### This is ${WORKSPACE}/scripts/optf-has/has/has_proxy_settings.sh"
 
 echo "optf/has proxy settings"
 if [ "$#" -eq  "1" ]; then
index 2d2eff3..24ecc06 100755 (executable)
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-echo "### This is ${WORKSPACE}/test/csit/scripts/optf-has/has/has_script.sh"
+echo "### This is ${WORKSPACE}/scripts/optf-has/has/has_script.sh"
 #
 # add here whatever commands is needed to prepare the optf/has CSIT testing
 #
@@ -38,11 +38,11 @@ BUNDLE=/tmp/conductor/properties/cert.pem
 
 mkdir -p /tmp/conductor/properties
 mkdir -p /tmp/conductor/logs
-cp ${WORKSPACE}/test/csit/scripts/optf-has/has/has-properties/conductor.conf.onap /tmp/conductor/properties/conductor.conf
-cp ${WORKSPACE}/test/csit/scripts/optf-has/has/has-properties/log.conf.onap /tmp/conductor/properties/log.conf
-cp ${WORKSPACE}/test/csit/scripts/optf-has/has/has-properties/cert.cer /tmp/conductor/properties/cert.cer
-cp ${WORKSPACE}/test/csit/scripts/optf-has/has/has-properties/cert.key /tmp/conductor/properties/cert.key
-cp ${WORKSPACE}/test/csit/scripts/optf-has/has/has-properties/cert.pem /tmp/conductor/properties/cert.pem
+cp ${WORKSPACE}/scripts/optf-has/has/has-properties/conductor.conf.onap /tmp/conductor/properties/conductor.conf
+cp ${WORKSPACE}/scripts/optf-has/has/has-properties/log.conf.onap /tmp/conductor/properties/log.conf
+cp ${WORKSPACE}/scripts/optf-has/has/has-properties/cert.cer /tmp/conductor/properties/cert.cer
+cp ${WORKSPACE}/scripts/optf-has/has/has-properties/cert.key /tmp/conductor/properties/cert.key
+cp ${WORKSPACE}/scripts/optf-has/has/has-properties/cert.pem /tmp/conductor/properties/cert.pem
 #chmod -R 777 /tmp/conductor/properties
 
 MUSIC_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat`
@@ -68,7 +68,7 @@ echo "Query MUSIC to check for reachability. Query Version"
 curl -vvvvv --noproxy "*" --request GET http://${MUSIC_IP}:8080/MUSIC/rest/v2/version -H "Content-Type: application/json"
  
 echo "Onboard conductor into music"
-curl -vvvvv --noproxy "*" --request POST http://${MUSIC_IP}:8080/MUSIC/rest/v2/admin/onboardAppWithMusic -H "Content-Type: application/json" --data @${WORKSPACE}/test/csit/tests/optf-has/has/data/onboard.json
+curl -vvvvv --noproxy "*" --request POST http://${MUSIC_IP}:8080/MUSIC/rest/v2/admin/onboardAppWithMusic -H "Content-Type: application/json" --data @${WORKSPACE}/tests/optf-has/has/data/onboard.json
 
 docker run -d --name cond-cont -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf ${IMAGE_NAME}:${IMAGE_VER} python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf
 sleep 20
@@ -82,7 +82,7 @@ docker run -d --name cond-data -v ${COND_CONF}:/usr/local/bin/conductor.conf -v
 sleep 20
 
 COND_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' cond-api`
-${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${COND_IP} 8091
+${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${COND_IP} 8091
 
 echo "inspect docker things for tracing purpose"
 docker inspect cond-data
index 7693d7b..811a39c 100755 (executable)
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-echo "### This is ${WORKSPACE}/test/csit/scripts/optf-has/has/music_script.sh"
+echo "### This is ${WORKSPACE}/scripts/optf-has/has/music_script.sh"
 #
 # add here whatever commands is needed to prepare the music setup for optf-has CSIT testing
 #
@@ -31,7 +31,7 @@ MUSIC_IMG=nexus3.onap.org:10001/onap/music/music:2.5.3
 WORK_DIR=/tmp/music
 CASS_USERNAME=nelson24
 CASS_PASSWORD=winman123
-MUSIC_SOURCE_PROPERTIES=${WORKSPACE}/test/csit/scripts/optf-has/has/music-properties
+MUSIC_SOURCE_PROPERTIES=${WORKSPACE}/scripts/optf-has/has/music-properties
 MUSIC_PROPERTIES=/tmp/music/properties
 MUSIC_LOGS=/tmp/music/logs
 mkdir -p ${MUSIC_PROPERTIES}
@@ -50,7 +50,7 @@ docker run -d --name music-db --network music-net -p "7000:7000" -p "7001:7001"
 #CASSA_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-db`
 CASSA_IP=`docker inspect -f '{{ $network := index .NetworkSettings.Networks "music-net" }}{{ $network.IPAddress}}' music-db`
 echo "CASSANDRA_IP=${CASSA_IP}"
-${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${CASSA_IP} 9042
+${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${CASSA_IP} 9042
 sleep 150
 # Start Music war
 docker run -d --name music-war -v music-vol:/app ${MUSIC_IMG};
@@ -77,7 +77,7 @@ docker network connect bridge music-tomcat;
 TOMCAT_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat`
 echo "TOMCAT_IP=${TOMCAT_IP}"
 
-${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${TOMCAT_IP} 8080
+${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${TOMCAT_IP} 8080
 
 # wait a while to make sure music is totally up and configured
 sleep 90
index 2e8a0e6..42dcd57 100755 (executable)
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-echo "### This is ${WORKSPACE}/test/csit/scripts/optf-has/has/simulator_script.sh"
+echo "### This is ${WORKSPACE}/scripts/optf-has/has/simulator_script.sh"
 #
 # add here whatever commands is needed to prepare the optf/has CSIT testing
 #
@@ -39,7 +39,7 @@ git clone https://gerrit.onap.org/r/optf/has
 if [ ${USER} != 'jenkins' ]; then
 
     # add proxy settings into this script when you work behind a proxy
-    ${WORKSPACE}/test/csit/scripts/optf-has/has/has_proxy_settings.sh ${WORK_DIR}
+    ${WORKSPACE}/scripts/optf-has/has/has_proxy_settings.sh ${WORK_DIR}
 
 fi
 
@@ -58,7 +58,7 @@ docker run -d --name aaisim -p 8081:8081  aaisim
 AAISIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aaisim`
 echo "AAISIM_IP=${AAISIM_IP}"
 
-${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${AAISIM_IP} 8081
+${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${AAISIM_IP} 8081
 
 # prepare multicloudsim
 cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/multicloudsim/
@@ -75,7 +75,7 @@ docker run -d --name multicloudsim -p 8082:8082  multicloudsim
 MULTICLOUDSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' multicloudsim`
 echo "MULTICLOUDSIM_IP=${MULTICLOUDSIM_IP}"
 
-${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${MULTICLOUDSIM_IP} 8082
+${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${MULTICLOUDSIM_IP} 8082
 
 # wait a while before continuing
 sleep 2
index 12509ed..b38401e 100755 (executable)
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-echo "This is ${WORKSPACE}/test/csit/scripts/policy/script1.sh"
+echo "This is ${WORKSPACE}/scripts/policy/script1.sh"
 
 
 # the directory of the script
index 84ab343..7ccc895 100755 (executable)
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# $1 docker image path under ${WORKSPACE}/test/csit/docker/
+# $1 docker image path under ${WORKSPACE}/docker/
 # $2 nickname for the instance
 # $3 docker run options, e.g. variables
 
index a4e933f..f231a26 100644 (file)
@@ -17,7 +17,7 @@
 # Modifications copyright (c) 2017 AT&T Intellectual Property
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/sdc/kill_and_remove_dataFolder.sh"
+echo "This is ${WORKSPACE}/scripts/sdc/kill_and_remove_dataFolder.sh"
 
 # copy logs to archive
 
index 41d3d2a..c1442d1 100644 (file)
@@ -2,7 +2,7 @@
 
 set -x
 
-echo "This is ${WORKSPACE}/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh"
+echo "This is ${WORKSPACE}/scripts/sdc/clone_and_setup_sdc_data.sh"
 
 # Clone sdc enviroment template 
 mkdir -p ${WORKSPACE}/data/environments/
@@ -39,15 +39,15 @@ source ${WORKSPACE}/data/clone/sdc/version.properties
 export RELEASE=$major.$minor-STAGING-latest
 export DEP_ENV=$ENV_NAME  
   
-cp ${WORKSPACE}/data/clone/sdc/sdc-os-chef/scripts/docker_run.sh ${WORKSPACE}/test/csit/scripts/sdc/
-#sed -i "s~/data~${WORKSPACE}\/data~g" ${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh
-#sed -i "s/HOST_IP=\${IP}/HOST_IP=\${HOST_IP}/g" ${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh
-#sed -i "s/ENVNAME=\"\${DEP_ENV}\"/ENVNAME=\"\${ENV_NAME}\"/g" ${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh
+cp ${WORKSPACE}/data/clone/sdc/sdc-os-chef/scripts/docker_run.sh ${WORKSPACE}/scripts/sdc/
+#sed -i "s~/data~${WORKSPACE}\/data~g" ${WORKSPACE}/scripts/sdc/docker_run.sh
+#sed -i "s/HOST_IP=\${IP}/HOST_IP=\${HOST_IP}/g" ${WORKSPACE}/scripts/sdc/docker_run.sh
+#sed -i "s/ENVNAME=\"\${DEP_ENV}\"/ENVNAME=\"\${ENV_NAME}\"/g" ${WORKSPACE}/scripts/sdc/docker_run.sh
 
 source ${WORKSPACE}/data/clone/sdc/version.properties
 export RELEASE=$major.$minor-STAGING-latest
 
-${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001 -tad
+${WORKSPACE}/scripts/sdc/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001 -tad
 
 sleep 120
 
index 81b43d2..6f8a232 100644 (file)
@@ -2,7 +2,7 @@
 
 set -x
 
-echo "This is ${WORKSPACE}/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh"
+echo "This is ${WORKSPACE}/scripts/sdc/clone_and_setup_sdc_data.sh"
 
 # Clone sdc enviroment template 
 mkdir -p ${WORKSPACE}/data/environments/
@@ -39,15 +39,15 @@ source ${WORKSPACE}/data/clone/sdc/version.properties
 export RELEASE=$major.$minor-STAGING-latest
 export DEP_ENV=$ENV_NAME  
   
-cp ${WORKSPACE}/data/clone/sdc/sdc-os-chef/scripts/docker_run.sh ${WORKSPACE}/test/csit/scripts/sdc/
-#sed -i "s~/data~${WORKSPACE}\/data~g" ${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh
-#sed -i "s/HOST_IP=\${IP}/HOST_IP=\${HOST_IP}/g" ${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh
-#sed -i "s/ENVNAME=\"\${DEP_ENV}\"/ENVNAME=\"\${ENV_NAME}\"/g" ${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh
+cp ${WORKSPACE}/data/clone/sdc/sdc-os-chef/scripts/docker_run.sh ${WORKSPACE}/scripts/sdc/
+#sed -i "s~/data~${WORKSPACE}\/data~g" ${WORKSPACE}/scripts/sdc/docker_run.sh
+#sed -i "s/HOST_IP=\${IP}/HOST_IP=\${HOST_IP}/g" ${WORKSPACE}/scripts/sdc/docker_run.sh
+#sed -i "s/ENVNAME=\"\${DEP_ENV}\"/ENVNAME=\"\${ENV_NAME}\"/g" ${WORKSPACE}/scripts/sdc/docker_run.sh
 
 source ${WORKSPACE}/data/clone/sdc/version.properties
 export RELEASE=$major.$minor-STAGING-latest
 
-${WORKSPACE}/test/csit/scripts/sdc/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001 -tud
+${WORKSPACE}/scripts/sdc/docker_run.sh -r ${RELEASE} -e ${ENV_NAME} -p 10001 -tud
 
 sleep 120
 
index 5bc8770..2aa4331 100644 (file)
@@ -22,7 +22,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/sdc/start_sdc_containers.sh"
+echo "This is ${WORKSPACE}/scripts/sdc/start_sdc_containers.sh"
 
 source ${WORKSPACE}/data/clone/sdc/version.properties
 export RELEASE=$major.$minor-STAGING-latest
index b87e3c1..9bd1a22 100644 (file)
@@ -17,4 +17,4 @@
 # Modifications copyright (c) 2017 AT&T Intellectual Property
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/sdnc/script1.sh"
+echo "This is ${WORKSPACE}/scripts/sdnc/script1.sh"
index 917016c..b236d3a 100644 (file)
@@ -22,7 +22,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/sdc/clone_and_setup_vid_data.sh"
+echo "This is ${WORKSPACE}/scripts/sdc/clone_and_setup_vid_data.sh"
 
 # Clone sdc enviroment template 
 
index 33a799d..9e72a42 100644 (file)
@@ -17,7 +17,7 @@
 # Modifications copyright (c) 2017 AT&T Intellectual Property
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/vid/kill_and_remove_dataFolder.sh"
+echo "This is ${WORKSPACE}/scripts/vid/kill_and_remove_dataFolder.sh"
 
 #kill and remove all vid dockers
 docker stop $(docker ps -a -q --filter="name=vid")
index c4bdae2..a058e1f 100644 (file)
 # ===================================================================
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
-echo "This is ${WORKSPACE}/test/csit/scripts/vid/start_vid_containers.sh"
+echo "This is ${WORKSPACE}/scripts/vid/start_vid_containers.sh"
 
 export IP=`ifconfig eth0 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'`
 
-cd ${WORKSPACE}/test/csit/tests/vid/resources
+cd ${WORKSPACE}/tests/vid/resources
 docker-compose up -d --build
 
 # WAIT 5 minutes maximum and test every 5 seconds if VID up using HealthCheck API
index a39ed08..866a82e 100644 (file)
@@ -22,7 +22,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/vvp/clone_and_setup_vvp_data.sh"
+echo "This is ${WORKSPACE}/scripts/vvp/clone_and_setup_vvp_data.sh"
 
 # Clone vvp enviroment template
 mkdir -p ${WORKSPACE}/data/environments/
index a6c108e..38bd331 100644 (file)
@@ -17,7 +17,7 @@
 # Modifications copyright (c) 2017 AT&T Intellectual Property
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/vvp/kill_and_remove_dataFolder.sh"
+echo "This is ${WORKSPACE}/scripts/vvp/kill_and_remove_dataFolder.sh"
 
 
 CONTAINER_NAME="vvp-engagementmgr"
index 5f905b6..cafc040 100644 (file)
@@ -22,7 +22,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-echo "This is ${WORKSPACE}/test/csit/scripts/vvp/start_vvp_containers.sh"
+echo "This is ${WORKSPACE}/scripts/vvp/start_vvp_containers.sh"
 
 export IP=$HOST_IP
 export PREFIX='nexus3.onap.org:10001/openecomp/vvp'
index c0a96db..7b99fb0 100644 (file)
@@ -52,5 +52,5 @@ ${DCAE_APP_API_MESSAGES_VALIDATION_PATH}       ${DCAE_APP_API_MESSAGES_PATH}/val
 
 ${ROUTED_MESSAGES_TOPIC}                       test-hv-ran-meas
 
-${VES_HV_RESOURCES}                            %{WORKSPACE}/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources
+${VES_HV_RESOURCES}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources
 ${VES_HV_CONFIGURATION_JSON_FILEPATH}          ${VES_HV_RESOURCES}/ves-hv-configuration.json
index 15c1c48..be24a87 100644 (file)
@@ -54,7 +54,7 @@ Unencrypted connection on both ends
 
 
 *** Variables ***
-${VES_HV_SCENARIOS}                            %{WORKSPACE}/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
+${VES_HV_SCENARIOS}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
 
 ${XNF_VALID_MESSAGES_REQUEST}                  ${VES_HV_SCENARIOS}/authorization/xnf-valid-messages-request.json
 
index f6a9787..f091de1 100644 (file)
@@ -8,7 +8,7 @@ XNF_SIMULATOR_NAME = "xNF Simulator"
 SIMULATOR_IMAGE_NAME = "onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator"
 SIMULATOR_IMAGE_FULL_NAME = os.getenv("DOCKER_REGISTRY_PREFIX") + SIMULATOR_IMAGE_NAME + ":latest"
 WORKSPACE_ENV = os.getenv("WORKSPACE")
-certificates_dir_path = WORKSPACE_ENV + "/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/"
+certificates_dir_path = WORKSPACE_ENV + "/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/"
 collector_certs_lookup_dir = "/etc/ves-hv/"
 ONE_SECOND_IN_NANOS = 10 ** 9
 
index 89208e4..1850df6 100644 (file)
@@ -77,7 +77,7 @@ ${HTTP_METHOD_URL}                             http://
 
 ${XNF_SIM_API_PATH}                            /simulator/async
 
-${VES_HV_SCENARIOS}                            %{WORKSPACE}/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
+${VES_HV_SCENARIOS}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
 ${XNF_FIXED_PAYLOAD_REQUEST}                   ${VES_HV_SCENARIOS}/fixed-payload/xnf-fixed-payload-request.json
 ${XNF_TOO_BIG_PAYLOAD_REQUEST}                 ${VES_HV_SCENARIOS}/too-big-payload/xnf-too-big-payload-request.json
 ${XNF_INVALID_WIRE_FRAME_REQUEST}              ${VES_HV_SCENARIOS}/invalid-wire-frame/xnf-invalid-wire-frame-request.json
index 9b1982a..442639e 100644 (file)
@@ -27,7 +27,7 @@ Handle Multiple Connections
 
 
 *** Variables ***
-${VES_HV_SCENARIOS}                            %{WORKSPACE}/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
+${VES_HV_SCENARIOS}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
 
 ${XNF_SMALLER_PAYLOAD_REQUEST}                 ${VES_HV_SCENARIOS}/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json
 ${DCAE_SMALLER_PAYLOAD_REQUEST}                ${VES_HV_SCENARIOS}/multiple-simulators-payload/dcae-smaller-valid-request.json
index 23d8666..55f484f 100644 (file)
@@ -10,15 +10,15 @@ Resource          ../../common.robot
 ${DMAAP_SIMULATOR_URL}    http://${DMAAP_SIMULATOR}
 ${AAI_SIMULATOR_URL}    http://${AAI_SIMULATOR}
 ${PRH_URL}        http://${PRH}
-${EVENT_WITH_ALL_VALID_REQUIRED_FIELDS}    %{WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/assets/json_events/event_with_all_fields.json
-${EVENT_WITH_IPV4}    %{WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV4.json
-${EVENT_WITH_IPV6}    %{WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV6.json
-${EVENT_WITH_MISSING_IPV4_AND_IPV6}    %{WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_IPV4_and_IPV6.json
-${EVENT_WITH_MISSING_SOURCENAME}    %{WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName.json
-${EVENT_WITH_MISSING_SOURCENAME_AND_IPV4}    %{WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_and_IPV4.json
-${EVENT_WITH_MISSING_SOURCENAME_AND_IPV6}    %{WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_and_IPV6.json
-${EVENT_WITH_MISSING_SOURCENAME_IPV4_AND_IPV6}    %{WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_IPV4_and_IPV6.json
-${Not_json_format}    %{WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/assets/json_events/not_json_format.json
+${EVENT_WITH_ALL_VALID_REQUIRED_FIELDS}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_all_fields.json
+${EVENT_WITH_IPV4}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV4.json
+${EVENT_WITH_IPV6}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV6.json
+${EVENT_WITH_MISSING_IPV4_AND_IPV6}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_IPV4_and_IPV6.json
+${EVENT_WITH_MISSING_SOURCENAME}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName.json
+${EVENT_WITH_MISSING_SOURCENAME_AND_IPV4}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_and_IPV4.json
+${EVENT_WITH_MISSING_SOURCENAME_AND_IPV6}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_and_IPV6.json
+${EVENT_WITH_MISSING_SOURCENAME_IPV4_AND_IPV6}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_missing_sourceName_IPV4_and_IPV6.json
+${Not_json_format}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/not_json_format.json
 
 *** Test Cases ***
 Valid DMaaP event can be converted to PNF_READY notification
index daed35f..f457f2c 100644 (file)
@@ -16,12 +16,12 @@ ${VESC_URL}                              http://%{VESC_IP}:8080
 ${VES_ANY_EVENT_PATH}                    /eventListener/v5
 ${VES_BATCH_EVENT_PATH}                 /eventListener/v5/eventBatch
 ${VES_THROTTLE_STATE_EVENT_PATH}         /eventListener/v5/clientThrottlingState
-${EVENT_DATA_FILE}                       %{WORKSPACE}/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event.json
-${EVENT_MEASURE_FILE}                    %{WORKSPACE}/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_vfirewall_measurement.json
-${EVENT_DATA_FILE_BAD}                   %{WORKSPACE}/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event_bad.json
-${EVENT_BATCH_DATA_FILE}                 %{WORKSPACE}/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json
-${EVENT_THROTTLING_STATE_DATA_FILE}      %{WORKSPACE}/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_volte_fault_provide_throttle_state.json
-${EVENT_PNF_REGISTRATION}                %{WORKSPACE}/test/csit/tests/dcaegen2/testcases/assets/json_events/ves_pnf_registration_event.json
+${EVENT_DATA_FILE}                       %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event.json
+${EVENT_MEASURE_FILE}                    %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_vfirewall_measurement.json
+${EVENT_DATA_FILE_BAD}                   %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_volte_single_fault_event_bad.json
+${EVENT_BATCH_DATA_FILE}                 %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_volte_fault_eventlist_batch.json
+${EVENT_THROTTLING_STATE_DATA_FILE}      %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_volte_fault_provide_throttle_state.json
+${EVENT_PNF_REGISTRATION}                %{WORKSPACE}/tests/dcaegen2/testcases/assets/json_events/ves_pnf_registration_event.json
 
 #DCAE Health Check
 ${CONFIG_BINDING_URL}                    http://localhost:8443
index b43ee29..d4188e3 100644 (file)
@@ -74,13 +74,13 @@ class DcaeLibrary(object):
                 client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
                 
                 client.connect(os.environ['CSIT_IP'], port=22, username=os.environ['CSIT_USER'], password=os.environ['CSIT_PD'])
-                stdin, stdout, stderr = client.exec_command('%{WORKSPACE}/test/csit/tests/dcaegen2/testcases/resources/vesc_enable_https_auth.sh')
+                stdin, stdout, stderr = client.exec_command('%{WORKSPACE}/tests/dcaegen2/testcases/resources/vesc_enable_https_auth.sh')
                 logger.console(stdout.read())    
             finally:
                 client.close()
             return
         ws = os.environ['WORKSPACE']
-        script2run = ws + "/test/csit/tests/dcaegen2/testcases/resources/vesc_enable_https_auth.sh"
+        script2run = ws + "/tests/dcaegen2/testcases/resources/vesc_enable_https_auth.sh"
         logger.info("Running script: " + script2run)
         logger.console("Running script: " + script2run)
         subprocess.call(script2run)
index a9456d0..ac1eb9f 100644 (file)
@@ -8,7 +8,7 @@ def get_environment_variable(env_varstr):
 DCAE_HEALTH_CHECK_URL = "http://135.205.228.129:8500"
 DCAE_HEALTH_CHECK_URL1 = "http://135.205.228.170:8500"
 
-CommonEventSchemaV5 = get_environment_variable('WORKSPACE') + "/test/csit/tests/dcaegen2/testcases/assets/json_events/CommonEventFormat_28.3.json"
+CommonEventSchemaV5 = get_environment_variable('WORKSPACE') + "/tests/dcaegen2/testcases/assets/json_events/CommonEventFormat_28.3.json"
 
 HttpServerThread = None
 HTTPD = None
index 6820050..013f6f0 100644 (file)
@@ -8,7 +8,7 @@ Variables         ../resources/DcaeVariables.py
 Resource          ../resources/dcae_properties.robot
 
 *** Variables ***
-${DCAE_HEALTH_CHECK_BODY}    %{WORKSPACE}/test/csit/tests/dcae/testcases/assets/json_events/dcae_healthcheck.json
+${DCAE_HEALTH_CHECK_BODY}    %{WORKSPACE}/tests/dcae/testcases/assets/json_events/dcae_healthcheck.json
 
 *** Keywords ***
 Create sessions
index 1298991..0755f07 100755 (executable)
@@ -16,7 +16,7 @@
 
 docker exec -it vesc /opt/app/VESCollector/bin/VESrestfulCollector.sh stop
 sleep 2 
-docker cp ${WORKSPACE}/test/csit/tests/dcaegen2/testcases/resources/collector.properties vesc:/opt/app/VESCollector/etc
+docker cp ${WORKSPACE}/tests/dcaegen2/testcases/resources/collector.properties vesc:/opt/app/VESCollector/etc
 sleep 10 
 docker exec -id vesc /opt/app/VESCollector/bin/VESrestfulCollector.sh start
 sleep 5
index 9098b1a..154b513 100644 (file)
@@ -12,7 +12,7 @@ ${VESC_URL}                              http://%{VESC_IP}:8080
 ${GLOBAL_APPLICATION_ID}                 robot-ves
 ${VES_ANY_EVENT_PATH}                    /eventListener/v7
 ${HEADER_STRING}                         content-type=application/json
-${EVENT_DATA_FILE}                       %{WORKSPACE}/test/csit/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json
+${EVENT_DATA_FILE}                       %{WORKSPACE}/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json
 
 ${TARGETURL_TOPICS}                      http://${DMAAP_MR_IP}:3904/topics
 ${TARGETURL_SUBSCR}                      http://${DMAAP_MR_IP}:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12?timeout=1000