[CSIT] Change SDNC/sdnr csit to use mariaDB

add docker-compose for mariaDB and set default sdnrdb

Issue-ID: SDNC-1819
Change-Id: Idab44253fa7a3cf10ea40c5eb46b8b3c207caca1
Signed-off-by: demskeq8 <alexander.dehn@highstreet-technologies.com>

diff --git a/csit/plans/sdnr/setup.sh b/csit/plans/sdnr/setup.sh
index ea780b9..8de39cd 100755 (executable)
--- a/csit/plans/sdnr/setup.sh
+++ b/csit/plans/sdnr/setup.sh
@@ -42,8 +42,8 @@ sdnr_launch
 ## SDNC ready state will be checked max SDNC_READY_TIMEOUT seconds
 # SDNC_READY_TIMEOUT=450
 
-# if jenkins should be ok without running robots TCS's
-SDNC_RELEASE_WITHOUT_ROBOT=true
+## if jenkins should be ok without running robots TCS's
+#SDNC_RELEASE_WITHOUT_ROBOT=true
 
 #Pass any variables required by Robot test suites in ROBOT_VARIABLES
 ROBOT_VARIABLES="--variablefile=${WORKSPACE}/plans/sdnr/testdata/localhost.py"

diff --git a/csit/scripts/sdnr/docker-compose/.env b/csit/scripts/sdnr/docker-compose/.env
index e75351a..6bd9455 100644 (file)
--- a/csit/scripts/sdnr/docker-compose/.env
+++ b/csit/scripts/sdnr/docker-compose/.env
@@ -23,9 +23,10 @@ SDNR_DM=true
 SDNR_WEBSOCKET_PORT=8182
 
 # sdnrdb
-ES_VERSION=7.9.3
-ES_IMAGE=docker.elastic.co/elasticsearch/elasticsearch-oss
-ESDB_IP=172.40.0.71
+MARIADB_VERSION=10.5
+MARIADB_IMAGE=bitnami/mariadb
+MARIADB_IP=172.40.0.71
+
 
 # sdnc-web
 #NEXUS_DOCKER_REPO see sdnc section

diff --git a/csit/scripts/sdnr/docker-compose/docker-compose-sdnrdb-mariadb.yaml b/csit/scripts/sdnr/docker-compose/docker-compose-sdnrdb-mariadb.yaml
new file mode 100644 (file)
index 0000000..686ae7d
--- /dev/null
+++ b/csit/scripts/sdnr/docker-compose/docker-compose-sdnrdb-mariadb.yaml
@@ -0,0 +1,44 @@
+# *******************************************************************************
+# * ============LICENSE_START========================================================================
+# * Copyright (C) 2021 highstreet technologies GmbH Intellectual Property. All rights reserved.
+# * =================================================================================================
+# * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+# * in compliance with the License. You may obtain a copy of the License at
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License
+# * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+# * or implied. See the License for the specific language governing permissions and limitations under
+# * the License.
+# * ============LICENSE_END==========================================================================
+version: "2.2"
+services:
+  sdnrdb:
+    image: ${MARIADB_IMAGE}:${MARIADB_VERSION}
+    container_name: sdnrdb
+    ports:
+      - 3306:3306
+    environment:
+      - MARIADB_ROOT_PASSWORD=admin
+      - MARIADB_DATABASE=sdnrdb
+      - MARIADB_USER=sdnrdb
+      - MARIADB_PASSWORD=sdnrdb
+      - MARIADB_EXTRA_FLAGS=--bind-address=* --max_connections=400
+      - MYSQL_ROOT_PASSWORD=admin
+      - MYSQL_DATABASE=sdnrdb
+      - MYSQL_USER=sdnrdb
+      - MYSQL_PASSWORD=sdnrdb
+    networks:
+      integration:
+        ipv4_address: ${MARIADB_IP}
+      
+networks:
+  integration:
+    name: ${NETWORK_NAME}
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+      - subnet: ${NETWORK_SUBNET}
+        gateway: ${GATEWAY_IP}

diff --git a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml
index cb44a7f..48c32ba 100644 (file)
--- a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml
+++ b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml
@@ -28,6 +28,10 @@ services:
       - SDNR_KAFKA_SASL_JAAS_CONFIG=PLAIN
       - SDNRUSERNAME=${ODL_ADMIN_USERNAME}
       - SDNRPASSWORD=${ODL_ADMIN_PASSWORD}
+      - SDNRDBTYPE=MARIADB
+      - SDNRDBURL=jdbc:mysql://sdnrdb:3306/sdnrdb
+      - SDNRDBUSERNAME=sdnrdb
+      - SDNRDBPASSWORD=sdnrdb
     volumes:
       - ./sdnr/certs/certs.properties:${ODL_CERT_DIR}/certs.properties
       - ./sdnr/certs/keys0.zip:${ODL_CERT_DIR}/keys0.zip

diff --git a/csit/scripts/sdnr/sdnr-launch.sh b/csit/scripts/sdnr/sdnr-launch.sh
index 39ca808..acc15de 100755 (executable)
--- a/csit/scripts/sdnr/sdnr-launch.sh
+++ b/csit/scripts/sdnr/sdnr-launch.sh
@@ -55,7 +55,7 @@ echo $env_file
 # Define sdnrdb type
 # default: ESDB
 # alternative: MARIADB
-SDNRDB_TYPE="${SDNRDB_TYPE:-ESDB}"
+SDNRDB_TYPE="${SDNRDB_TYPE:-MARIADB}"
 if [[ "$SDNRDB_TYPE" == "ESDB" ]]; then
   sdnrdb_compose_file="docker-compose-sdnrdb-elasticsearch.yaml"
 else

diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index 65992be..644ec50 100755 (executable)
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -310,6 +310,7 @@ printf "%s\n" "  SDNRDM=$SDNRDM"
 printf "%s\n" "  SDNRONLY=$SDNRONLY"
 printf "%s\n" "  SDNRINIT=$SDNRINIT"
 printf "%s\n" "  SDNRDBURL=$SDNRDBURL"
+printf "%s\n" "  SDNRDBTYPE=$SDNRDBTYPE"
 printf "%s\n" "  SDNRDBUSERNAME=$SDNRDBUSERNAME"
 printf "%s\n" "  GEO_ENABLED=$GEO_ENABLED"
 printf "%s\n" "  IS_PRIMARY_CLUSTER=$IS_PRIMARY_CLUSTER"