X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Fauto-test%2FFTC150.sh;h=f30f3e963a65319ac4891f6de5710287e77d8275;hb=refs%2Fchanges%2F89%2F10889%2F2;hp=5219e1b3131a7afe482be5a35bba5fc253b45b29;hpb=36acb0c596211d3d771deb421eb71a05b3489e84;p=nonrtric.git diff --git a/test/auto-test/FTC150.sh b/test/auto-test/FTC150.sh index 5219e1b3..f30f3e96 100755 --- a/test/auto-test/FTC150.sh +++ b/test/auto-test/FTC150.sh @@ -1,7 +1,7 @@ #!/bin/bash # ============LICENSE_START=============================================== -# Copyright (C) 2020 Nordix Foundation. All rights reserved. +# Copyright (C) 2020-2023 Nordix Foundation. All rights reserved. # ======================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ # -TC_ONELINE_DESCR="Sample tests of the SDNC A1 controller restconf API using http/https (no agent)" +TC_ONELINE_DESCR="Sample tests of the SDNC A1 controller restconf API using http/https (no a1pms)" #App names to include in the test when running docker, space separated list DOCKER_INCLUDED_IMAGES="RICSIM SDNC KUBEPROXY" @@ -33,7 +33,7 @@ KUBE_PRESTARTED_IMAGES=" " CONDITIONALLY_IGNORED_IMAGES="" #Supported test environment profiles -SUPPORTED_PROFILES="ONAP-GUILIN ONAP-HONOLULU ONAP-ISTANBUL ONAP-JAKARTA ORAN-CHERRY ORAN-D-RELEASE ORAN-E-RELEASE ORAN-F-RELEASE" +SUPPORTED_PROFILES="ONAP-JAKARTA ONAP-KOHN ONAP-LONDON ORAN-F-RELEASE ORAN-G-RELEASE ORAN-H-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -43,9 +43,9 @@ setup_testenvironment #### TEST BEGIN #### -generate_policy_uuid +sim_generate_policy_uuid -#Test agent and simulator protocol versions (others are http only) +#Test a1pms and simulator protocol versions (others are http only) NB_TESTED_PROTOCOLS="HTTP HTTPS" SB_TESTED_PROTOCOLS="HTTP HTTPS" @@ -66,20 +66,25 @@ for __nb_httpx in $NB_TESTED_PROTOCOLS ; do start_ric_simulators ricsim_g1 1 OSC_2.1.0 start_ric_simulators ricsim_g2 1 STD_1.1.3 - if [ "$PMS_VERSION" == "V2" ]; then - start_ric_simulators ricsim_g3 1 STD_2.0.0 - fi + start_ric_simulators ricsim_g3 1 STD_2.0.0 - start_sdnc if [ $__nb_httpx == "HTTPS" ]; then # "Using secure ports towards SDNC" - use_sdnc_https + if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then + deviation "SDNC does not support NB https" + use_sdnc_http + else + use_sdnc_https + fi else #"Using non-secure ports towards SDNC" use_sdnc_http fi + start_sdnc + controller_api_wait_for_status_ok 200 ricsim_g1_1 + if [ $__sb_httpx == "HTTPS" ]; then # "Using secure ports towards SDNC" use_simulator_https