Upgrade SDN-C

Issue-ID: CPS-802
Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
Change-Id: I29604d4e57160c346b5a2a8ce30bda816eae2ecb
Signed-off-by: JosephKeenan <joseph.keenan@est.tech>
Signed-off-by: lukegleeson <luke.gleeson@est.tech>

diff --git a/csit/plans/cps/sdnc/docker-compose.yml b/csit/plans/cps/sdnc/docker-compose.yml
index 1b7fe1f..30d8207 100644 (file)
--- a/csit/plans/cps/sdnc/docker-compose.yml
+++ b/csit/plans/cps/sdnc/docker-compose.yml
@@ -1,5 +1,5 @@
 # ============LICENSE_START=======================================================
-# Copyright (C) 2021 Nordix Foundation
+# Copyright (C) 2021-2022 Nordix Foundation
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,47 +18,56 @@ version: '3'
 
 services:
   mariadb:
-    image: mariadb:10.1.11
+    image: mariadb:10.5
     ports:
       - "3306:3306"
-    container_name: mariadb
     environment:
-      - MYSQL_ROOT_PASSWORD=password
-    hostname:
-      mariadb.so.testlab.onap.org
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-password}
+      - MYSQL_ROOT_HOST=%
+      - MYSQL_USER=${MYSQL_USER:-sdnc}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD:-password}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-sdncdb}
     logging:
       driver: "json-file"
       options:
         max-size: "30m"
         max-file: "5"
+
   sdnc:
-    image: onap/sdnc-image:1.8.1
+    image: onap/sdnc-image:${VERSION:-2.2.3}
     container_name: sdnc
-    volumes: 
-      - /etc/localtime:/etc/localtime:ro
-      - $SDNC_CERT_PATH:/opt/opendaylight/current/certs
+    depends_on :
+      - mariadb
     entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
     ports:
       - "8282:8181"
     hostname:
       sdnc
-    depends_on:
-      - mariadb
+    links:
+      - mariadb:dbhost
+      - mariadb:sdnctldb01
+      - mariadb:sdnctldb02
     environment:
-      - MYSQL_ROOT_PASSWORD=password
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-password}
+      - MYSQL_USER=${MYSQL_USER:-sdnc}
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD:-password}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-sdncdb}
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
-      - MYSQL_PASSWD=password
-      - ODL_CERT_DIR=/opt/opendaylight/current/certs
-      - ODL_ADMIN_USERNAME=admin
-      - ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+      - SDNC_BIN=/opt/onap/sdnc/bin
+      - ODL_CERT_DIR=/opt/opendaylight/certs
+      - ODL_ADMIN_USERNAME=${ODL_USER:-admin}
+      - ODL_ADMIN_PASSWORD=${ODL_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
+      - SDNC_DB_INIT=true
+      - SQL_CRYPTKEY=${SQL_CRYPTKEY:-fakECryptKey}
+
+    volumes:
+      - ./certs/certs.properties:/opt/opendaylight/certs/certs.properties
+      - ./certs/keys0.zip:/opt/opendaylight/certs/keys0.zip
+
     dns:
       - ${DNS_IP_ADDR-10.0.100.1}
     logging:
-      driver:   "json-file"
+      driver: "json-file"
       options:
         max-size: "30m"
-        max-file: "5"
-    extra_hosts:
-      - sdnctldb02:${LOCAL_IP}
-      - sdnctldb01:${LOCAL_IP}
-      - dbhost:${LOCAL_IP}
\ No newline at end of file
+        max-file: "5"
\ No newline at end of file

diff --git a/csit/plans/cps/sdnc/sdnc_setup.sh b/csit/plans/cps/sdnc/sdnc_setup.sh
index c2b7a84..9c17b83 100644 (file)
--- a/csit/plans/cps/sdnc/sdnc_setup.sh
+++ b/csit/plans/cps/sdnc/sdnc_setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # ============LICENSE_START=======================================================
-#   Copyright (C) 2021 Nordix Foundation.
+#   Copyright (C) 2021-2022 Nordix Foundation.
 # ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

diff --git a/csit/plans/cps/teardown.sh b/csit/plans/cps/teardown.sh
index f1939cf..7beb907 100755 (executable)
--- a/csit/plans/cps/teardown.sh
+++ b/csit/plans/cps/teardown.sh
@@ -20,6 +20,8 @@
 # Modifications Copyright (C) 2021 Nordix Foundation
 # Branched from ccsdk/distribution to this repository Feb 23, 2021
 #
+echo '================================== docker info =========================='
+docker ps -a
 
 echo '================================== CPS-NCMP Logs ========================'
 docker logs cps-and-ncmp
@@ -27,6 +29,9 @@ docker logs cps-and-ncmp
 echo '================================== DMI Logs ============================='
 docker logs ncmp-dmi-plugin
 
+echo '================================== SDNC Logs ============================'
+docker logs sdnc
+
 echo 'Stopping, Removing all running containers...'
 docker stop $(docker ps -aq) && docker rm $(docker ps -aq)
 

diff --git a/csit/run-csit.sh b/csit/run-csit.sh
index 9220ef9..52ec218 100755 (executable)
--- a/csit/run-csit.sh
+++ b/csit/run-csit.sh
@@ -189,7 +189,7 @@ SUITES=$( xargs -a testplan.txt )
 echo ROBOT_VARIABLES="${ROBOT_VARIABLES}"
 echo "Starting Robot test suites ${SUITES} ..."
 relax_set
-python -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES}
+python3 -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES}
 RESULT=$?
 load_set
 echo "RESULT: $RESULT"

diff --git a/csit/tests/ncmp-passthrough/ncmp-passthrough.robot b/csit/tests/ncmp-passthrough/ncmp-passthrough.robot
index 1d977b9..32d9604 100644 (file)
--- a/csit/tests/ncmp-passthrough/ncmp-passthrough.robot
+++ b/csit/tests/ncmp-passthrough/ncmp-passthrough.robot
@@ -36,8 +36,8 @@ ${netconf}              NETCONF
 
 *** Test Cases ***
 
-Get for Passthough Operational (CF, RO) with fields
-    ${uri}=              Set Variable       ${ncmpBasePath}/v1/ch/PNFDemo/data/ds/ncmp-datastore:passthrough-operational?resourceIdentifier=ietf-netconf-monitoring:netconf-state&options=(fields=schemas/schema/location)
+Get for Passthrough Operational (CF, RO) with fields
+    ${uri}=              Set Variable       ${ncmpBasePath}/v1/ch/PNFDemo/data/ds/ncmp-datastore:passthrough-operational?resourceIdentifier=ietf-netconf-monitoring:netconf-state&options=(fields=schemas/schema)
     ${headers}=          Create Dictionary  Authorization=${auth}
     ${response}=         Get On Session     CPS_URL   ${uri}   headers=${headers}   expected_status=200
     ${responseJson}=     Set Variable       ${response.json()}