Integrated gateway and updated kube support
Restructured the test env to decouple the test engine from the components
Issue-ID: NONRTRIC-441
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: I07c746741b1c5c964679545f0a12861e5e9f6292
diff --git a/test/simulator-group/sdnc/app.yaml b/test/simulator-group/sdnc/app.yaml
index cd170f6..75e30d4 100644
--- a/test/simulator-group/sdnc/app.yaml
+++ b/test/simulator-group/sdnc/app.yaml
@@ -35,6 +35,10 @@
value: 'true'
- name: A1_TRUSTSTORE_PASSWORD
value: $SDNC_A1_TRUSTSTORE_PASSWORD
+ - name: ODL_ADMIN_USERNAME
+ value: $SDNC_USER
+ - name: ODL_ADMIN_PASSWORD
+ value: $SDNC_PWD
command:
- /opt/onap/sdnc/bin/startODL.sh
---
diff --git a/test/simulator-group/sdnc/app2.yaml b/test/simulator-group/sdnc/app2.yaml
new file mode 100644
index 0000000..116ce66
--- /dev/null
+++ b/test/simulator-group/sdnc/app2.yaml
@@ -0,0 +1,96 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: $SDNC_APP_NAME
+ namespace: $KUBE_NONRTRIC_NAMESPACE
+ labels:
+ run: $SDNC_APP_NAME
+ autotest: SDNC
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ run: $SDNC_APP_NAME
+ template:
+ metadata:
+ labels:
+ run: $SDNC_APP_NAME
+ autotest: SDNC
+ spec:
+ containers:
+ - name: $SDNC_APP_NAME
+ image: $SDNC_A1_CONTROLLER_IMAGE
+ imagePullPolicy: Never
+ ports:
+ - name: http
+ containerPort: $SDNC_INTERNAL_PORT
+ - name: https
+ containerPort: $SDNC_INTERNAL_SECURE_PORT
+ env:
+ - name: MYSQL_ROOT_PASSWORD
+ value: 'itsASecret'
+ - name: MYSQL_USER
+ value: 'sdnctl'
+ - name: MYSQL_PASSWORD
+ value: 'gamma'
+ - name: MYSQL_DATABASE
+ value: 'sdnctl'
+ - name: SDNC_CONFIG_DIR
+ value: '/opt/onap/sdnc/data/properties'
+ - name: SDNC_BIN
+ value: '/opt/onap/sdnc/bin'
+ - name: ODL_CERT_DIR
+ value: '/tmp'
+ - name: ODL_ADMIN_USERNAME
+ value: $SDNC_USER
+ - name: ODL_ADMIN_PASSWORD
+ value: $SDNC_PWD
+ - name: ODL_USERNAME
+ value: $SDNC_USER
+ - name: ODL_PASSWORD
+ value: $SDNC_PWD
+ - name: SDNC_DB_INIT
+ value: 'true'
+ - name: A1_TRUSTSTORE_PASSWORD
+ value: $SDNC_A1_TRUSTSTORE_PASSWORD
+ command:
+ - /opt/onap/sdnc/bin/startODL.sh
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: $SDNC_DB_APP_NAME
+ namespace: $KUBE_NONRTRIC_NAMESPACE
+ labels:
+ run: $SDNC_DB_APP_NAME
+ autotest: SDNC
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ run: $SDNC_DB_APP_NAME
+ template:
+ metadata:
+ labels:
+ run: $SDNC_DB_APP_NAME
+ autotest: SDNC
+ spec:
+ containers:
+ - name: $SDNC_DB_APP_NAME
+ image: $SDNC_DB_IMAGE
+ imagePullPolicy: Never
+ ports:
+ - name: http
+ containerPort: 3306
+ env:
+ - name: MYSQL_ROOT_PASSWORD
+ value: 'itsASecret'
+ - name: MYSQL_ROOT_HOST
+ value: '%'
+ - name: MYSQL_USER
+ value: 'sdnctl'
+ - name: MYSQL_PASSWORD
+ value: 'gamma'
+ - name: MYSQL_DATABASE
+ value: 'sdnctl'
+
diff --git a/test/simulator-group/sdnc/docker-compose-2.yml b/test/simulator-group/sdnc/docker-compose-2.yml
new file mode 100644
index 0000000..9d81df5
--- /dev/null
+++ b/test/simulator-group/sdnc/docker-compose-2.yml
@@ -0,0 +1,83 @@
+# ==================================================================================
+# Modifications Copyright (c) 2019 Nordix Foundation.
+#
+# 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.
+# ==================================================================================
+version: '3'
+
+networks:
+ default:
+ external:
+ name: ${DOCKER_SIM_NWNAME}
+
+services:
+ db:
+ image: ${SDNC_DB_IMAGE}
+ container_name: ${SDNC_DB_APP_NAME}
+ networks:
+ - default
+ ports:
+ - "3306"
+ environment:
+ - MYSQL_ROOT_PASSWORD=itsASecret
+ - MYSQL_ROOT_HOST=%
+ - MYSQL_USER=sdnctl
+ - MYSQL_PASSWORD=gamma
+ - MYSQL_DATABASE=sdnctl
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+ labels:
+ - "nrttest_app=SDNC"
+ - "nrttest_dp=SDNC DB"
+
+ a1controller:
+ image: ${SDNC_A1_CONTROLLER_IMAGE}
+ depends_on :
+ - db
+ container_name: ${SDNC_APP_NAME}
+ networks:
+ - default
+ entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
+ ports:
+ - ${SDNC_EXTERNAL_PORT}:${SDNC_INTERNAL_PORT}
+ - ${SDNC_EXTERNAL_SECURE_PORT}:${SDNC_INTERNAL_SECURE_PORT}
+ links:
+ - db:dbhost
+ - db:sdnctldb01
+ - db:sdnctldb02
+ environment:
+ - MYSQL_ROOT_PASSWORD=itsASecret
+ - MYSQL_USER=sdnctl
+ - MYSQL_PASSWORD=gamma
+ - MYSQL_DATABASE=sdnctl
+ - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+ - SDNC_BIN=/opt/onap/sdnc/bin
+ - ODL_CERT_DIR=/tmp
+ - ODL_ADMIN_USERNAME=${SDNC_USER}
+ - ODL_ADMIN_PASSWORD=${SDNC_PWD}
+ - ODL_USER=${SDNC_USER}
+ - ODL_PASSWORD=${SDNC_PWD}
+ - SDNC_DB_INIT=true
+ - A1_TRUSTSTORE_PASSWORD=${SDNC_A1_TRUSTSTORE_PASSWORD}
+ - AAI_TRUSTSTORE_PASSWORD=changeit
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "30m"
+ max-file: "5"
+ labels:
+ - "nrttest_app=SDNC"
+ - "nrttest_dp=${SDNC_DISPLAY_NAME}"
diff --git a/test/simulator-group/sdnc/docker-compose.yml b/test/simulator-group/sdnc/docker-compose.yml
index 80f60f7..0b6f357 100644
--- a/test/simulator-group/sdnc/docker-compose.yml
+++ b/test/simulator-group/sdnc/docker-compose.yml
@@ -36,6 +36,9 @@
options:
max-size: "30m"
max-file: "5"
+ labels:
+ - "nrttest_app=SDNC"
+ - "nrttest_dp=SDNC DB"
a1controller:
image: ${SDNC_A1_CONTROLLER_IMAGE}
@@ -57,9 +60,13 @@
- SDNC_DB_INIT=true
- SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
- A1_TRUSTSTORE_PASSWORD=${SDNC_A1_TRUSTSTORE_PASSWORD}
+ - ODL_ADMIN_USERNAME=${SDNC_USER}
+ - ODL_ADMIN_PASSWORD=${SDNC_PWD}
logging:
driver: "json-file"
options:
max-size: "30m"
max-file: "5"
-
+ labels:
+ - "nrttest_app=SDNC"
+ - "nrttest_dp=${SDNC_DISPLAY_NAME}"