commit 496156d78828c000cbde44c96cc37c57032f2244
author BjornMagnussonXA <bjorn.magnusson@est.tech> Mon Aug 10 14:16:24 2020 +0200
committer BjornMagnussonXA <bjorn.magnusson@est.tech> Mon Aug 10 17:13:23 2020 +0200
tree 3873d8662b623bc908c2220b3d5c3c35097b0cd2
parent 113bf0910498992f20a6cb70f2bc70d4d5b204ca

Updated some function test cases with https

Change-Id: Ic4f75e47db5b23e66024967a974c4c807ff4f07e

Issue-ID: NONRTRIC-268

Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: Ibb1e8a09bbd6e7e1d0a388e4cfd89cac6bff0093

test/auto-test/FTC300.sh

diff --git a/test/auto-test/FTC300.sh b/test/auto-test/FTC300.sh
index 3d575db..13647c9 100755
--- a/test/auto-test/FTC300.sh
+++ b/test/auto-test/FTC300.sh
@@ -30,11 +30,6 @@
 
 generate_uuid
 
-#Local vars in test script
-##########################
-# Path to callback receiver
-CR_PATH="https://$CR_APP_NAME:$CR_EXTERNAL_SECURE_PORT/callbacks"
-
 # Tested variants of REST/DMAAP/SDNC config
 TESTED_VARIANTS="REST   DMAAP   REST+SDNC   DMAAP+SDNC DMAAP_BATCH DMAAP_BATCH+SDNC"
 #Test agent and simulator protocol versions (others are http only)
@@ -48,6 +43,18 @@
         echo "#####################################################################"
         echo "#####################################################################"
 
+        #Local vars in test script
+        ##########################
+
+        if [ $__httpx == "HTTPS" ]; then
+            # Path to callback receiver
+            CR_PATH="https://$CR_APP_NAME:$CR_EXTERNAL_SECURE_PORT/callbacks"
+            use_cr_https
+        else
+            # Path to callback receiver
+            CR_PATH="http://$CR_APP_NAME:$CR_EXTERNAL_PORT/callbacks"
+            use_cr_http
+        fi
 
         # Clean container and start all needed containers #
         clean_containers
@@ -76,6 +83,13 @@
 
         if [[ $interface = *"SDNC"* ]]; then
             start_sdnc
+            if [ $__httpx == "HTTPS" ]; then
+                # "Using secure ports towards SDNC"
+                use_sdnc_https
+            else
+                #"Using non-secure ports towards SDNC"
+                use_sdnc_http
+            fi
             prepare_consul_config      SDNC  ".consul_config.json"
         else
             prepare_consul_config      NOSDNC  ".consul_config.json"
@@ -90,7 +104,13 @@
         set_agent_debug
 
         if [[ $interface == *"DMAAP"* ]]; then
-            use_agent_dmaap
+            if [ $__httpx == "HTTPS" ]; then
+                echo "Using secure ports towards dmaap"
+                use_agent_dmaap_https
+            else
+                echo "Using non-secure ports towards dmaap"
+                use_agent_dmaap_http
+            fi
         else
             if [ $__httpx == "HTTPS" ]; then
                 echo "Using secure ports towards the agent"