aboutsummaryrefslogtreecommitdiffstats
path: root/plans
diff options
context:
space:
mode:
authordenilson.l65 <denilson.l65@wipro.com>2021-10-28 05:35:37 +0000
committerdenilson.l65 <denilson.l65@wipro.com>2021-10-28 09:25:39 +0000
commite774d8e154736681f8bb918b581bcd2d3fd87eb3 (patch)
tree9bcf313335c605f1ca56fc2932c488ffff6722dc /plans
parent85321a52e56422c1bb552c10387d27066decee84 (diff)
Add CPS & AAI components in slice-analysis-ms csit
Issue-ID: DCAEGEN2-2956 Signed-off-by: denilson.l65 <denilson.l65@wipro.com> Change-Id: I5b687b7a76a91e96d2934c9c17f8f72d6097485b
Diffstat (limited to 'plans')
-rw-r--r--plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json6
-rw-r--r--plans/dcaegen2-services-slice-analysis-ms/testsuites/setup.sh5
-rw-r--r--plans/dcaegen2-services-slice-analysis-ms/testsuites/teardown.sh3
-rw-r--r--plans/dcaegen2-services-slice-analysis-ms/testsuites/testplan.txt3
4 files changed, 13 insertions, 4 deletions
diff --git a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json b/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json
index 75938019..7504ca86 100644
--- a/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json
+++ b/plans/dcaegen2-services-slice-analysis-ms/testsuites/config/sliceanalysisms/config_all.json
@@ -64,9 +64,9 @@
"sliceanalysisms.pollingTimeout": 60,
"sliceanalysisms.cid": "sliceanalysisms-cid",
"sliceanalysisms.configDb.service": "http://configdb_sim:5000",
- "sliceanalysisms.aai.url": "http://configdb_sim:5000/aai/v21",
- "sliceanalysisms.cps.url": "http://configdb_sim:5000",
- "sliceanalysisms.configDbEnabled": "true",
+ "sliceanalysisms.aai.url": "https://aai-resources:8447/aai/v21",
+ "sliceanalysisms.cps.url": "http://cps-tbdmt:8080/execute/ran-network",
+ "sliceanalysisms.configDbEnabled": "false",
"service_calls": {
"policy-req": []
},
diff --git a/plans/dcaegen2-services-slice-analysis-ms/testsuites/setup.sh b/plans/dcaegen2-services-slice-analysis-ms/testsuites/setup.sh
index 1c52d718..b75df561 100644
--- a/plans/dcaegen2-services-slice-analysis-ms/testsuites/setup.sh
+++ b/plans/dcaegen2-services-slice-analysis-ms/testsuites/setup.sh
@@ -5,6 +5,7 @@ docker login -u docker -p docker nexus3.onap.org:10001
TEST_PLANS_DIR=$WORKSPACE/plans/dcaegen2-services-slice-analysis-ms/testsuites
TEST_SCRIPTS_DIR=$WORKSPACE/scripts/dcaegen2-services-slice-analysis-ms/slice-analysis-ms
TEST_ROBOT_DIR=$WORKSPACE/tests/dcaegen2-services-slice-analysis-ms/testcases
+TEST_SCRIPTS_CPS_DIR=$WORKSPACE/scripts/dcaegen2-services-slice-analysis-ms/slice-analysis-ms/cps-aai
docker-compose up -d
@@ -56,5 +57,9 @@ sleep 10
CONFIGDB_SIM_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' configdb_sim)
echo "CONFIGDB_SIM_IP=${CONFIGDB_SIM_IP}"
+# CPS & AAI set up
+cd $TEST_SCRIPTS_CPS_DIR
+sh cps-aai-setup.sh
ROBOT_VARIABLES="-v ZOOKEEPER_IP:${ZOOKEEPER_IP} -v KAFKA_IP:${KAFKA_IP} -v DMAAP_IP:${DMAAP_IP} -v SLICE_ANALYSIS_MS_POSTGRES_IP:${SLICE_ANALYSIS_MS_POSTGRES_IP} -v SLICE_ANALYSIS_MS_IP:${SLICE_ANALYSIS_MS_IP} -v CONFIGDB_SIM_IP:${CONFIGDB_SIM_IP} -v TEST_ROBOT_DIR:${TEST_ROBOT_DIR}"
+
diff --git a/plans/dcaegen2-services-slice-analysis-ms/testsuites/teardown.sh b/plans/dcaegen2-services-slice-analysis-ms/testsuites/teardown.sh
index 516bf8cb..2ac53527 100644
--- a/plans/dcaegen2-services-slice-analysis-ms/testsuites/teardown.sh
+++ b/plans/dcaegen2-services-slice-analysis-ms/testsuites/teardown.sh
@@ -1,9 +1,12 @@
#!/bin/bash
echo "Starting teardown script"
TEST_PLANS_DIR=$WORKSPACE/plans/dcaegen2-services-slice-analysis-ms/testsuites
+TEST_SCRIPTS_DIR=$WORKSPACE/scripts/dcaegen2-services-slice-analysis-ms/slice-analysis-ms/cps-aai
mkdir -p $WORKSPACE/archives
docker container stop configdb_sim
docker container rm configdb_sim
docker-compose -f $TEST_PLANS_DIR/docker-compose.yaml logs > $WORKSPACE/archives/sonhandler-docker-compose.log
+docker-compose -f $TEST_SCRIPTS_DIR/docker-compose.yaml down -v
docker-compose -f $TEST_PLANS_DIR/docker-compose.yaml down -v
+
diff --git a/plans/dcaegen2-services-slice-analysis-ms/testsuites/testplan.txt b/plans/dcaegen2-services-slice-analysis-ms/testsuites/testplan.txt
index a8b2bdab..d8708f41 100644
--- a/plans/dcaegen2-services-slice-analysis-ms/testsuites/testplan.txt
+++ b/plans/dcaegen2-services-slice-analysis-ms/testsuites/testplan.txt
@@ -1,3 +1,4 @@
# Test suites are relative paths under [integration/csit.git]/tests/.
# Place the suites in run order.
-dcaegen2-services-slice-analysis-ms/testcases
+#dcaegen2-services-slice-analysis-ms/testcases/slice-analysis-ms-test.robot
+dcaegen2-services-slice-analysis-ms/testcases/slice-analysis-ms-test-cps-aai.robot