summaryrefslogtreecommitdiffstats
path: root/csit
diff options
context:
space:
mode:
Diffstat (limited to 'csit')
-rw-r--r--csit/plans/sdnc/setup.sh5
-rwxr-xr-xcsit/scripts/docker-compose.yml4
-rwxr-xr-xcsit/sdnc-csit.env10
-rw-r--r--csit/tests/sdnc/sdnc_csit.robot32
4 files changed, 26 insertions, 25 deletions
diff --git a/csit/plans/sdnc/setup.sh b/csit/plans/sdnc/setup.sh
index ba1c0b86..ec5d9b9e 100644
--- a/csit/plans/sdnc/setup.sh
+++ b/csit/plans/sdnc/setup.sh
@@ -18,7 +18,8 @@
# Modifications copyright (c) 2021 AT&T Intellectual Property
#
-#
+# Remove all dangling images
+docker image prune -f
###################### Netconf Simulator Setup ######################
@@ -30,7 +31,7 @@ fi
mkdir ${WORKSPACE}/archives/pnf-simulator
git clone "https://gerrit.onap.org/r/integration/simulators/pnf-simulator" ${WORKSPACE}/archives/pnf-simulator
-# Fix docker-compose to add nexus repo for onap dockers
+# Fix docker-compose to add nexus repo for onap dockers
mv ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/docker-compose.yml ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/docker-compose.yml.orig
cat ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/docker-compose.yml.orig | sed -e "s/image: onap/image: nexus3.onap.org:10001\/onap/" > ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/docker-compose.yml
diff --git a/csit/scripts/docker-compose.yml b/csit/scripts/docker-compose.yml
index 4a36dc7a..525538a4 100755
--- a/csit/scripts/docker-compose.yml
+++ b/csit/scripts/docker-compose.yml
@@ -24,7 +24,7 @@ services:
sdnc:
image: onap/sdnc-image:latest
- container_name: sdnc
+ container_name: sdnc_controller
volumes:
- /etc/localtime:/etc/localtime:ro
- $SDNC_CERT_PATH:/opt/opendaylight/current/certs
@@ -50,7 +50,7 @@ services:
- ODL_USER=${ODL_USER}
- ODL_PASSWORD=${ODL_PASSWORD}
- ODL_CERT_DIR=/opt/opendaylight/current/certs
- - SDNC_DB_INIT=true
+ - SDNC_DB_INIT=true
- HONEYCOMB_USER=${HONEYCOMB_USER}
- HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD}
- TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD}
diff --git a/csit/sdnc-csit.env b/csit/sdnc-csit.env
index 5176380b..e1c95f58 100755
--- a/csit/sdnc-csit.env
+++ b/csit/sdnc-csit.env
@@ -1,4 +1,4 @@
-export SDNC_CONTAINER_NAME=sdnc
+export SDNC_CONTAINER_NAME=sdnc_controller
export DB_CONTAINER_NAME=mariadb
export SDNC_CERT_PATH=${WORKSPACE}/archives/certs
export NETCONF_PNP_SIM_CONTAINER_NAME=netconf-simulator
@@ -9,10 +9,10 @@ export GERRIT_BRANCH=${GERRIT_BRANCH:-master}
export NEXUS_USERNAME=${NEXUS_USERNAME:-docker}
export NEXUS_PASSWD=${NEXUS_PASSWD:-docker}
export NEXUS_DOCKER_REPO=${NEXUS_DOCKER_REPO:-nexus3.onap.org:10001}
-export MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-secretPassword}
-export MYSQL_USER=${MYSQL_USER:-testdb}
-export MYSQL_PASSWORD=${MYSQL_PASSWORD:-test123}
-export MYSQL_DATABASE=${MYSQL_DATABASE:-testdb}
+export MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-itsASecret}
+export MYSQL_USER=${MYSQL_USER:-sdnctl}
+export MYSQL_PASSWORD=${MYSQL_PASSWORD:-gamma}
+export MYSQL_DATABASE=${MYSQL_DATABASE:-sdnctl}
export ODL_USER=${ODL_USER:-admin}
export ODL_PASSWORD=${ODL_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
export HONEYCOMB_USER=${HONEYCOMB_USER:-admin}
diff --git a/csit/tests/sdnc/sdnc_csit.robot b/csit/tests/sdnc/sdnc_csit.robot
index 957a95f1..7fdbbbfe 100644
--- a/csit/tests/sdnc/sdnc_csit.robot
+++ b/csit/tests/sdnc/sdnc_csit.robot
@@ -43,20 +43,20 @@ Check GRA service assign
[Documentation] Testing GRA service assign
Send Post File And Validate Response ${GRA_SERVICE_TOPOLOGY} ${GRA_DATA_DIRECTORY}/svc-topology-assign.json 200
-Check GRA network assign
- [Tags] SDNC-GRA-NETWORK-ASSIGN
- [Documentation] Testing GRA network assign
- Send Post File And Validate Response ${GRA_NETWORK_TOPOLOGY} ${GRA_DATA_DIRECTORY}/network-topology-assign.json 200
+#Check GRA network assign
+# [Tags] SDNC-GRA-NETWORK-ASSIGN
+# [Documentation] Testing GRA network assign
+# Send Post File And Validate Response ${GRA_NETWORK_TOPOLOGY} ${GRA_DATA_DIRECTORY}/network-topology-assign.json 200
-Check GRA vnf assign
- [Tags] SDNC-GRA-VNF-ASSIGN
- [Documentation] Testing GRA vnf assign
- Send Post File And Validate Response ${GRA_VNF_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vnf-topology-assign.json 200
+#Check GRA vnf assign
+# [Tags] SDNC-GRA-VNF-ASSIGN
+# [Documentation] Testing GRA vnf assign
+# Send Post File And Validate Response ${GRA_VNF_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vnf-topology-assign.json 200
-Check GRA vf-module assign
- [Tags] SDNC-GRA-VF-MODULE-ASSIGN
- [Documentation] Testing GRA vf-module assign
- Send Post File And Validate Response ${GRA_VFMODULE_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vf-module-topology-assign.json 200
+#Check GRA vf-module assign
+# [Tags] SDNC-GRA-VF-MODULE-ASSIGN
+# [Documentation] Testing GRA vf-module assign
+# Send Post File And Validate Response ${GRA_VFMODULE_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vf-module-topology-assign.json 200
Check GRA vf-module unassign
[Tags] SDNC-GRA-VF-MODULE-UNASSIGN
@@ -68,10 +68,10 @@ Check GRA vnf unassign
[Documentation] Testing GRA vnf unassign
Send Post File And Validate Response ${GRA_VNF_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vnf-topology-unassign.json 200
-Check GRA network unassign
- [Tags] SDNC-GRA-NETWORK-UNASSIGN
- [Documentation] Testing GRA network unassign
- Send Post File And Validate Response ${GRA_NETWORK_TOPOLOGY} ${GRA_DATA_DIRECTORY}/network-topology-unassign.json 200
+#Check GRA network unassign
+# [Tags] SDNC-GRA-NETWORK-UNASSIGN
+# [Documentation] Testing GRA network unassign
+# Send Post File And Validate Response ${GRA_NETWORK_TOPOLOGY} ${GRA_DATA_DIRECTORY}/network-topology-unassign.json 200
Check GRA service delete
[Tags] SDNC-GRA-SERVICE-DELETE