X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC150.sh;h=ead424c327c195bb4b3db76b14b15d7f0bb32ab3;hb=b5cb68ea0e77d0a1421b4f17cc58b981628c29f7;hp=1cd2a33ab3c3441c5eb26d2b94ae338c31594d33;hpb=e704d116cf5d97ca5faad93c536901f3351df93f;p=nonrtric.git

diff --git a/test/auto-test/FTC150.sh b/test/auto-test/FTC150.sh
index 1cd2a33a..ead424c3 100755
--- a/test/auto-test/FTC150.sh
+++ b/test/auto-test/FTC150.sh
@@ -20,8 +20,8 @@
 
 TC_ONELINE_DESCR="Sample tests of the SDNC A1 controller restconf API using http/https (no agent)"
 
-#App names to exclude checking pulling images for, space separated list
-EXCLUDED_IMAGES="PA CP SDNC_ONAP"
+#App names to include in the test, space separated list
+INCLUDED_IMAGES="RICSIM SDNC"
 
 . ../common/testcase_common.sh  $@
 . ../common/controller_api_functions.sh
@@ -32,65 +32,79 @@ EXCLUDED_IMAGES="PA CP SDNC_ONAP"
 generate_uuid
 
 #Test agent and simulator protocol versions (others are http only)
-TESTED_PROTOCOLS="HTTP HTTPS"
+NB_TESTED_PROTOCOLS="HTTP HTTPS"
+SB_TESTED_PROTOCOLS="HTTP HTTPS"
 
-for __httpx in $TESTED_PROTOCOLS ; do
+for __nb_httpx in $NB_TESTED_PROTOCOLS ; do
+    for __sb_httpx in $SB_TESTED_PROTOCOLS ; do
 
-    echo "#####################################################################"
-    echo "#####################################################################"
-    echo "### Testing SDNC using: $__httpx"
-    echo "#####################################################################"
-    echo "#####################################################################"
+        echo "#####################################################################"
+        echo "#####################################################################"
+        echo "### Testing SDNC using Northbound: $__nb_httpx and Southbound: $__sb_httpx"
+        echo "#####################################################################"
+        echo "#####################################################################"
 
 
-    # Clean container and start all needed containers #
-    clean_containers
+        # Clean container and start all needed containers #
+        clean_containers
 
-    start_ric_simulators ricsim_g1 1  OSC_2.1.0
-    start_ric_simulators ricsim_g2 1  STD_1.1.3
+        start_ric_simulators ricsim_g1 1  OSC_2.1.0
+        start_ric_simulators ricsim_g2 1  STD_1.1.3
 
-    start_sdnc
+        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
+        if [ $__nb_httpx == "HTTPS" ]; then
+            # "Using secure ports towards SDNC"
+            use_sdnc_https
+        else
+            #"Using non-secure ports towards SDNC"
+            use_sdnc_http
+        fi
 
-    # API tests
+        if [ $__sb_httpx == "HTTPS" ]; then
+            # "Using secure ports towards SDNC"
+            use_simulator_https
+        else
+            #"Using non-secure ports towards SDNC"
+            use_simulator_http
+        fi
 
-    controller_api_get_A1_policy_type 404 OSC ricsim_g1_1 1
+        # API tests
 
-    sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
+        controller_api_get_A1_policy_type 404 OSC ricsim_g1_1 1
 
+        sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
 
-    controller_api_get_A1_policy_ids 200 OSC ricsim_g1_1 1
-    controller_api_get_A1_policy_ids 200 STD ricsim_g2_1
 
-    controller_api_get_A1_policy_type 200 OSC ricsim_g1_1 1
-    controller_api_get_A1_policy_type 200 OSC ricsim_g1_1 1 testdata/OSC/sim_1.json
-    controller_api_get_A1_policy_type 404 OSC ricsim_g1_1 99
+        controller_api_get_A1_policy_ids 200 OSC ricsim_g1_1 1
+        controller_api_get_A1_policy_ids 200 STD ricsim_g2_1
 
-    controller_api_put_A1_policy 202 OSC ricsim_g1_1 1 4000 testdata/OSC/pi1_template.json
-    controller_api_put_A1_policy 404 OSC ricsim_g1_1 5 1001 testdata/OSC/pi1_template.json
-    controller_api_put_A1_policy 201 STD ricsim_g2_1   5000 testdata/STD/pi1_template.json
+        controller_api_get_A1_policy_type 200 OSC ricsim_g1_1 1
+        controller_api_get_A1_policy_type 200 OSC ricsim_g1_1 1 testdata/OSC/sim_1.json
+        controller_api_get_A1_policy_type 404 OSC ricsim_g1_1 99
 
-    controller_api_get_A1_policy_ids 200 OSC ricsim_g1_1 1 4000
-    controller_api_get_A1_policy_ids 200 STD ricsim_g2_1 5000
+        controller_api_put_A1_policy 202 OSC ricsim_g1_1 1 4000 testdata/OSC/pi1_template.json
+        controller_api_put_A1_policy 404 OSC ricsim_g1_1 5 1001 testdata/OSC/pi1_template.json
+        controller_api_put_A1_policy 201 STD ricsim_g2_1   5000 testdata/STD/pi1_template.json
 
-    controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000
-    controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000
+        controller_api_get_A1_policy_ids 200 OSC ricsim_g1_1 1 4000
+        controller_api_get_A1_policy_ids 200 STD ricsim_g2_1 5000
 
-    VAL='NOT IN EFFECT'
-    controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000 "$VAL" "false"
-    controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000 "UNDEFINED"
+        controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000
+        controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000
 
-    controller_api_delete_A1_policy 202 OSC ricsim_g1_1 1 4000
-    controller_api_delete_A1_policy 204 STD ricsim_g2_1 5000
+        VAL='NOT IN EFFECT'
+        controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000 "$VAL" "false"
+        controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000 "UNDEFINED"
 
-    store_logs          $__httpx
+        controller_api_delete_A1_policy 202 OSC ricsim_g1_1 1 4000
+        controller_api_delete_A1_policy 204 STD ricsim_g2_1 5000
+
+        check_sdnc_logs
+
+        store_logs          "NB_"$__nb_httpx"_SB_"$__sb_httpx
+
+    done
 
 done