Update SDNC image version to OSLO 3.0.2

- Changed image version of SDNC to 3.0.2
- Changed OpenApi endpoint, that is used as alive check in FTC tests
- Used SDNC user and password for that endpoint

Issue-ID: NONRTRIC-1017
Change-Id: I51c0c03c4f174dc82eb133d2f230146290113eaf
Signed-off-by: lapentafd <francesco.lapenta@est.tech>

diff --git a/test/common/sdnc_api_functions.sh b/test/common/sdnc_api_functions.sh
index a18afe3..1438e8e 100644 (file)
--- a/test/common/sdnc_api_functions.sh
+++ b/test/common/sdnc_api_functions.sh
@@ -151,9 +151,11 @@ __sdnc_set_protocoll() {
        ## Access to SDNC
 
        SDNC_SERVICE_PATH=$1"://"$SDNC_APP_NAME":"$2  # docker access, container->container and script->container via proxy
+       SDNC_SERVICE_PATH_USER=$1"://"$SDNC_USER":"$SDNC_PWD"@"$SDNC_APP_NAME":"$2  # docker access with user and password
        SDNC_SERVICE_API_PATH=$1"://"$SDNC_USER":"$SDNC_PWD"@"$SDNC_APP_NAME":"$2$SDNC_API_URL
        if [ $RUNMODE == "KUBE" ]; then
                SDNC_SERVICE_PATH=$1"://"$SDNC_APP_NAME.$KUBE_SDNC_NAMESPACE":"$3 # kube access, pod->svc and script->svc via proxy
+               SDNC_SERVICE_PATH_USER=$1"://"$SDNC_USER":"$SDNC_PWD"@"$SDNC_APP_NAME.$KUBE_SDNC_NAMESPACE":"$3 # kube access with username and password
                SDNC_SERVICE_API_PATH=$1"://"$SDNC_USER":"$SDNC_PWD"@"$SDNC_APP_NAME.$KUBE_SDNC_NAMESPACE":"$3$SDNC_API_URL
        fi
        echo ""
@@ -242,7 +244,7 @@ start_sdnc() {
 
                fi
 
-               __check_service_start $SDNC_APP_NAME $SDNC_SERVICE_PATH$SDNC_ALIVE_URL
+               __check_service_start $SDNC_APP_NAME $SDNC_SERVICE_PATH_USER$SDNC_ALIVE_URL
        else
 
                __check_included_image 'SDNC'
@@ -256,7 +258,7 @@ start_sdnc() {
 
                __start_container $SDNC_COMPOSE_DIR $SDNC_COMPOSE_FILE NODOCKERARGS 1 $SDNC_APP_NAME
 
-               __check_service_start $SDNC_APP_NAME $SDNC_SERVICE_PATH$SDNC_ALIVE_URL
+               __check_service_start $SDNC_APP_NAME $SDNC_SERVICE_PATH_USER$SDNC_ALIVE_URL
        fi
     echo ""
     return 0

diff --git a/test/common/test_env-onap-oslo.sh b/test/common/test_env-onap-oslo.sh
index 20b1b9e..8a5bdc7 100644 (file)
--- a/test/common/test_env-onap-oslo.sh
+++ b/test/common/test_env-onap-oslo.sh
@@ -76,10 +76,10 @@ A1PMS_IMAGE_TAG_REMOTE_RELEASE="2.0.0"
 
 # SDNC A1 Controller remote image and tag
 SDNC_A1_CONTROLLER_IMAGE_BASE="onap/sdnc-image"
-SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="2.6.1-SNAPSHOT" ###CHECK THIS
-SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="2.6.1-STAGING-latest"
-SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="2.6.1-STAGING-latest"  #Will use snapshot repo
-SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="2.6.1"
+SDNC_A1_CONTROLLER_IMAGE_TAG_LOCAL="3.0.2-SNAPSHOT" ###CHECK THIS
+SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_SNAPSHOT="3.0.2-STAGING-latest"
+SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE="3.0.2-STAGING-latest"  #Will use snapshot repo
+SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE="3.0.2"
 
 #SDNC DB remote image and tag
 #The DB is part of SDNC so handled in the same way as SDNC
@@ -306,17 +306,17 @@ SDNC_INTERNAL_SECURE_PORT=8443                           # SNDC A1 Controller co
 SDNC_DB_APP_NAME="sdncdb"                                # Name of the SDNC DB container
 SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter"                  # SDNC truststore password
 SDNC_USER="admin"                                        # SDNC username
-SDNC_PWD="admin"                                         # SNDC PWD
 SDNC_PWD="Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"   # SNDC PWD
 SDNC_API_URL="/rests/operations/A1-ADAPTER-API:"         # Base url path for SNDC API (for upgraded sdnc)
-#SDNC_API_URL="/restconf/operations/A1-ADAPTER-API:"      # Base url path for SNDC API
-SDNC_ALIVE_URL="/apidoc/explorer/index.html"             # Base url path for SNDC API docs (for alive check)
+#SDNC_API_URL="/restconf/operations/A1-ADAPTER-API:"     # Base url path for SNDC API
+SDNC_ALIVE_URL="/openapi/explorer/index.html"            # Base url path for SNDC API docs (for alive check) (for upgraded sdnc)
+#SDNC_ALIVE_URL="/apidoc/explorer/index.html"            # Base url path for SNDC API docs (for alive check)
 SDNC_COMPOSE_DIR="sdnc"
 SDNC_COMPOSE_FILE="docker-compose-2.yml"
 SDNC_KUBE_APP_FILE="app2.yaml"
 SDNC_KARAF_LOG="/opt/opendaylight/data/log/karaf.log"    # Path to karaf log
 SDNC_RESPONSE_JSON_KEY="A1-ADAPTER-API:output"           # Key name for output json in replies from sdnc (for upgraded sdnc)
-#SDNC_RESPONSE_JSON_KEY="output"                          # Key name for output json in replies from sdnc
+#SDNC_RESPONSE_JSON_KEY="output"                         # Key name for output json in replies from sdnc
 SDNC_FEATURE_LEVEL="TRANS_RESP_CODE NO_NB_HTTPS"         # Space separated list of features
                                                          # TRANS_RESP_CODE: SDNC return southbound response code
 

diff --git a/test/common/test_env-oran-k-release.sh b/test/common/test_env-oran-k-release.sh
index c152223..32e9ac1 100644 (file)
--- a/test/common/test_env-oran-k-release.sh
+++ b/test/common/test_env-oran-k-release.sh
@@ -91,7 +91,7 @@ NRT_GATEWAY_IMAGE_TAG_REMOTE_RELEASE="1.2.0"
 
 # SDNC A1 Controller image and tags - Note using released honolulu ONAP image
 SDNC_A1_CONTROLLER_IMAGE_BASE="onap/sdnc-image"
-SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE_ONAP="2.6.1"
+SDNC_A1_CONTROLLER_IMAGE_TAG_REMOTE_RELEASE_ONAP="3.0.2"
 #No local image for ONAP SDNC, remote release image always used
 
 # ORAN SDNC adapter kept as reference
@@ -411,18 +411,18 @@ SDNC_INTERNAL_SECURE_PORT=8443                           # SNDC A1 Controller co
 SDNC_DB_APP_NAME="sdncdb"                                # Name of the SDNC DB container
 SDNC_A1_TRUSTSTORE_PASSWORD="a1adapter"                  # SDNC truststore password
 SDNC_USER="admin"                                        # SDNC username
-SDNC_PWD="admin"                                         # SNDC PWD
 SDNC_PWD="Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"   # SNDC PWD
-#SDNC_API_URL="/rests/operations/A1-ADAPTER-API:"         # Base url path for SNDC API (for upgraded sdnc)
-SDNC_API_URL="/restconf/operations/A1-ADAPTER-API:"      # Base url path for SNDC API
-SDNC_ALIVE_URL="/apidoc/explorer/index.html"                       # Base url path for SNDC API docs (for alive check)
+SDNC_API_URL="/rests/operations/A1-ADAPTER-API:"         # Base url path for SNDC API (for upgraded sdnc)
+#SDNC_API_URL="/restconf/operations/A1-ADAPTER-API:"     # Base url path for SNDC API
+SDNC_ALIVE_URL="/openapi/explorer/index.html"            # Base url path for SNDC API docs (for alive check)(for upgraded sdnc)
+#SDNC_ALIVE_URL="/apidoc/explorer/index.html"            # Base url path for SNDC API docs (for alive check)
 SDNC_COMPOSE_DIR="sdnc"
 SDNC_COMPOSE_FILE="docker-compose-2.yml"
 SDNC_KUBE_APP_FILE="app2.yaml"
 SDNC_KARAF_LOG="/opt/opendaylight/data/log/karaf.log"    # Path to karaf log
-#SDNC_RESPONSE_JSON_KEY="A1-ADAPTER-API:output"           # Key name for output json in replies from sdnc (for upgraded sdnc)
-SDNC_RESPONSE_JSON_KEY="output"                          # Key name for output json in replies from sdnc
-SDNC_FEATURE_LEVEL="NO_NB_HTTPS"                                    # Space separated list of features
+SDNC_RESPONSE_JSON_KEY="A1-ADAPTER-API:output"           # Key name for output json in replies from sdnc (for upgraded sdnc)
+#SDNC_RESPONSE_JSON_KEY="output"                         # Key name for output json in replies from sdnc
+SDNC_FEATURE_LEVEL="NO_NB_HTTPS"                         # Space separated list of features
 
 RAPP_CAT_APP_NAME="rappcatalogueservice"                 # Name for the RAPP Catalogue
 RAPP_CAT_DISPLAY_NAME="RAPP Catalogue"