Use non-default admin password

Use non-default admin password

Issue-ID: OAM-535
Change-Id: Ie1ddd62d48ebd1ef3643869f0cc6e438acc11a45
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>

diff --git a/CICD/bin/setup.sh b/CICD/bin/setup.sh
index 1b0a6ef..66aaafa 100755 (executable)
--- a/CICD/bin/setup.sh
+++ b/CICD/bin/setup.sh
@@ -30,6 +30,7 @@ CUSTOM_O_RU_MPLANE_SSH_CALLHOME="ietf-netconf-server-ssh-callhome.json"
 CUSTOM_O_RU_MPLANE_TLS_CALLHOME="ietf-netconf-server-tls-callhome.json"
 CUSTOM_O_RU_MPLANE_TLS_NON_CALLHOME="ietf-netconf-server-tls-listen.json"
 SDNR_COMPONENTS_DC_FILE="docker-compose-sdnr-mariadb.yaml"
+ENV_FILE=".env"
 # Code everything relative to the BINDIR
 BINDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ROOTDIR="$(cd "${BINDIR}/.." && pwd)"
@@ -95,8 +96,9 @@ start_pynts() {
     cp ${CONFIGDIR}/${CUSTOM_O_RU_MPLANE_SSH_CALLHOME} ${TMPDIR}/sim-o1-ofhmp-interfaces/o-ru-mplane/data
     cp ${CONFIGDIR}/${CUSTOM_O_RU_MPLANE_TLS_CALLHOME} ${TMPDIR}/sim-o1-ofhmp-interfaces/o-ru-mplane/data
     cp ${CONFIGDIR}/${CUSTOM_O_RU_MPLANE_TLS_NON_CALLHOME} ${TMPDIR}/sim-o1-ofhmp-interfaces/o-ru-mplane/data
+    cat ${CONFIGDIR}/${ENV_FILE} >> ${TMPDIR}/sim-o1-ofhmp-interfaces/.env
     log "## Starting PyNTS simulator ##"
-    docker compose -f ${TMPDIR}/sim-o1-ofhmp-interfaces/${CUSTOM_O_RU_MPLANE_DC_FILE} up -d 
+    docker compose -f ${TMPDIR}/sim-o1-ofhmp-interfaces/${CUSTOM_O_RU_MPLANE_DC_FILE} up -d
 }
 
 start_sdnr_components() {

diff --git a/CICD/config/.env b/CICD/config/.env
index 960f1dd..816fcae 100644 (file)
--- a/CICD/config/.env
+++ b/CICD/config/.env
@@ -1,9 +1,9 @@
+# SDNR and PYNTS ENV VARS
 SDNC_IMAGE=o-ran-sc/oam-oam-controller/sdnr-image:latest
-ADMIN_PASSWORD=admin
+ADMIN_PASSWORD=admin123
 SDNC_REST_PORT=8181
 SDNC_CERT_DIR=/opt/opendaylight/current/certs
 
-SDNRDB_IMAGE_ES=docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.3
 SDNC_DB_IMAGE=docker.io/library/mariadb:11.1.2
 SDNC_DB_ROOT_PASSWORD=sdnrdb
 SDNC_DB_USERNAME=sdnrdb

diff --git a/CICD/config/docker-compose-o-ru-mplane.yaml b/CICD/config/docker-compose-o-ru-mplane.yaml
index 16005a3..51b0dc4 100644 (file)
--- a/CICD/config/docker-compose-o-ru-mplane.yaml
+++ b/CICD/config/docker-compose-o-ru-mplane.yaml
@@ -24,7 +24,7 @@ services:
 
       - SDNR_RESTCONF_URL=http://172.18.0.3:8181
       - SDNR_USERNAME=admin
-      - SDNR_PASSWORD=admin
+      - SDNR_PASSWORD=${ADMIN_PASSWORD}
     ports:
       - "8300:830"
       - "65130:6513"
@@ -46,7 +46,7 @@ services:
 
       - SDNR_RESTCONF_URL=http://172.18.0.3:8181
       - SDNR_USERNAME=admin
-      - SDNR_PASSWORD=admin
+      - SDNR_PASSWORD=${ADMIN_PASSWORD}
     ports:
       - "8301:830"
       - "65131:6513"
@@ -68,7 +68,7 @@ services:
       - SDNR_CERTIFICATE_MARKERS=True
       - SDNR_RESTCONF_URL=http://172.18.0.3:8181
       - SDNR_USERNAME=admin
-      - SDNR_PASSWORD=admin
+      - SDNR_PASSWORD=${ADMIN_PASSWORD}
     ports:
       - "8302:830"
       - "65132:6513"
@@ -90,7 +90,7 @@ services:
 
       - SDNR_RESTCONF_URL=http://172.18.0.3:8181
       - SDNR_USERNAME=admin
-      - SDNR_PASSWORD=admin
+      - SDNR_PASSWORD=${ADMIN_PASSWORD}
     ports:
       - "8303:830"
       - "65133:6513"

diff --git a/CICD/config/sdnrconfig.json b/CICD/config/sdnrconfig.json
index d4657f6..8e0a8de 100644 (file)
--- a/CICD/config/sdnrconfig.json
+++ b/CICD/config/sdnrconfig.json
@@ -4,6 +4,6 @@
     "basicAuth": true,
     "credentials": {
         "sdnrUsername": "admin",
-        "sdnrPassword": "admin"
+        "sdnrPassword": "admin123"
     }
 }
\ No newline at end of file