diff options
| author |   Michal Jagiello <michal.jagiello@t-mobile.pl> | 2022-07-13 12:50:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-07-13 12:50:12 +0000 |
| commit | ae1a866583e8216b2e088038084d978c74d6b6e8 (patch) | |
| tree | 3c9a9a5e432d4f7394b6fa17989c430eaea604a4 /plans | |
| parent | 727bc7d74848fb20a53b6d28539cc493d4c8dabd (diff) | |
| parent | ea92dc3d81885b320906bc32b989ee4aea011a8c (diff) | |
Merge "[DCAEGEN2] Update son-handler CSIT with CPS"
Diffstat (limited to 'plans')
4 files changed, 19 insertions, 2 deletions
diff --git a/plans/dcaegen2-services-son-handler/testsuites/config/sonhms/config_all.json b/plans/dcaegen2-services-son-handler/testsuites/config/sonhms/config_all.json index 8372142d..465dfe2d 100644 --- a/plans/dcaegen2-services-son-handler/testsuites/config/sonhms/config_all.json +++ b/plans/dcaegen2-services-son-handler/testsuites/config/sonhms/config_all.json @@ -83,6 +83,14 @@ "sonhandler.cg": "sonhms-cg", "sonhandler.pollingInterval": 20, "sonhandler.badThreshold": 50, + "cps.username": "cps", + "cps.password": "cpsr0cks!", + "sonhandler.clientType": "cps", + "cps.service.url": "http://cps-tbdmt:8080", + "cps.get.celldata": "execute/cps-ran-schemaset/get-cell-data", + "cps.get.nbr.list.url":"execute/cps-ran-schemaset/get-nbr-list", + "cps.get.pci.url": "execute/ran-network-schemaset/get-pci", + "cps.get.pnf.url": "execute/ran-network-schemaset/get-pnf", "sonhandler.bufferTime": 60, "sonhandler.cid": "sonhms-cid", "sonhandler.configDb.service": "http://configdb_oof_sim:5000", diff --git a/plans/dcaegen2-services-son-handler/testsuites/setup.sh b/plans/dcaegen2-services-son-handler/testsuites/setup.sh index 6f895a1e..76fefb85 100644 --- a/plans/dcaegen2-services-son-handler/testsuites/setup.sh +++ b/plans/dcaegen2-services-son-handler/testsuites/setup.sh @@ -3,8 +3,9 @@ docker login -u docker -p docker nexus3.onap.org:10001 TEST_PLANS_DIR=$WORKSPACE/plans/dcaegen2-services-son-handler/testsuites -TEST_SCRIPTS_DIR=$WORKSPACE/scripts/dcaegen2-services-son-handler/sonhandler +TEST_SCRIPTS_DIR=$WORKSPACE/scripts/dcaegen2-services-son-handler/sonhandler/cps-sonhandler TEST_ROBOT_DIR=$WORKSPACE/tests/dcaegen2-services-son-handler/testcases +TEST_SCRIPTS_CPS_DIR=$WORKSPACE/scripts/dcaegen2-services-son-handler/sonhandler/cps-sonhandler/cps docker-compose up -d @@ -57,5 +58,9 @@ sleep 60 CONFIGDB_OOF_SIM_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' configdb_oof_sim) echo "CONFIGDB_OOF_SIM_IP=${CONFIGDB_OOF_SIM_IP}" +# CPS set up +cd $TEST_SCRIPTS_CPS_DIR +sh cps-setup.sh + ROBOT_VARIABLES="-v ZOOKEEPER_IP:${ZOOKEEPER_IP} -v KAFKA_IP:${KAFKA_IP} -v DMAAP_IP:${DMAAP_IP} -v SONHMS_POSTGRES_IP:${SONHMS_POSTGRES_IP} -v SONHMS_IP:${SONHMS_IP} -v CONFIGDB_OOF_SIM_IP:${CONFIGDB_OOF_SIM_IP} -v TEST_ROBOT_DIR:${TEST_ROBOT_DIR}" diff --git a/plans/dcaegen2-services-son-handler/testsuites/teardown.sh b/plans/dcaegen2-services-son-handler/testsuites/teardown.sh index 7db3d2f6..14019ef0 100644 --- a/plans/dcaegen2-services-son-handler/testsuites/teardown.sh +++ b/plans/dcaegen2-services-son-handler/testsuites/teardown.sh @@ -1,9 +1,11 @@ #!/bin/bash echo "Starting teardown script" TEST_PLANS_DIR=$WORKSPACE/plans/dcaegen2-services-son-handler/testsuites +TEST_SCRIPTS_CPS_DIR=$WORKSPACE/scripts/dcaegen2-services-son-handler/sonhandler/cps-sonhandler/cps mkdir -p $WORKSPACE/archives docker container stop configdb_oof_sim docker container rm configdb_oof_sim docker-compose -f $TEST_PLANS_DIR/docker-compose.yaml logs > $WORKSPACE/archives/sonhandler-docker-compose.log docker-compose -f $TEST_PLANS_DIR/docker-compose.yaml down -v +docker-compose -f $TEST_SCRIPTS_CPS_DIR/docker-compose.yaml down -v diff --git a/plans/dcaegen2-services-son-handler/testsuites/testplan.txt b/plans/dcaegen2-services-son-handler/testsuites/testplan.txt index 2f8b7606..54e1c1f3 100644 --- a/plans/dcaegen2-services-son-handler/testsuites/testplan.txt +++ b/plans/dcaegen2-services-son-handler/testsuites/testplan.txt @@ -1,3 +1,5 @@ # Test suites are relative paths under [integration/csit.git]/tests/. # Place the suites in run order. -dcaegen2-services-son-handler/testcases +# dcaegen2-services-son-handler/testcases +# dcaegen2-services-son-handler/testcases/sonhandler-test.robot +dcaegen2-services-son-handler/testcases/son-handler-test-cps.robot |