X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC100.sh;h=a473338700022597b3aceac9bbaf63957b9623a5;hb=refs%2Fchanges%2F88%2F12388%2F5;hp=55f7d8244e9de6652bbc9aafa11b576a8364fc8f;hpb=2918bef3d237c99e6cf7e9c1ab1722781128617b;p=nonrtric.git diff --git a/test/auto-test/FTC100.sh b/test/auto-test/FTC100.sh index 55f7d824..a4733387 100755 --- a/test/auto-test/FTC100.sh +++ b/test/auto-test/FTC100.sh @@ -1,7 +1,8 @@ #!/bin/bash # ============LICENSE_START=============================================== -# Copyright (C) 2020 Nordix Foundation. All rights reserved. +# Copyright (C) 2020-2023 Nordix Foundation. All rights reserved. +# Copyright (C) 2023 OpenInfra Foundation Europe. 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,23 +19,29 @@ # -TC_ONELINE_DESCR="Full a1pms API walkthrough using a1pms REST/DMAAP and with/without SDNC A1 Controller" +TC_ONELINE_DESCR="Full a1pms API walkthrough using a1pms REST and with/without SDNC A1 Controller" + +USE_ISTIO=0 #App names to include in the test when running docker, space separated list -DOCKER_INCLUDED_IMAGES="CBS CONSUL CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY" +DOCKER_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC NGW KUBEPROXY" #App names to include in the test when running kubernetes, space separated list -KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC KUBEPROXY NGW" -#Prestarted app (not started by script) to include in the test when running kubernetes, space separated list +if [ $USE_ISTIO -eq 0 ]; then + KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC KUBEPROXY NGW" +else + KUBE_INCLUDED_IMAGES="CP CR MR A1PMS RICSIM SDNC KUBEPROXY NGW KEYCLOAK ISTIO AUTHSIDECAR" +fi +#Pre-started app (not started by script) to include in the test when running kubernetes, space separated list KUBE_PRESTARTED_IMAGES="" #Ignore image in DOCKER_INCLUDED_IMAGES, KUBE_INCLUDED_IMAGES if #the image is not configured in the supplied env_file #Used for images not applicable to all supported profile -CONDITIONALLY_IGNORED_IMAGES="CBS CONSUL NGW" +CONDITIONALLY_IGNORED_IMAGES="NGW" #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-KOHN ONAP-LONDON ONAP-MONTREAL ORAN-G-RELEASE ORAN-H-RELEASE ORAN-I-RELEASE" #Supported run modes SUPPORTED_RUNMODES="DOCKER KUBE" @@ -44,13 +51,35 @@ setup_testenvironment #### TEST BEGIN #### -generate_policy_uuid - -# Tested variants of REST/DMAAP/SDNC config -TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC" - -#Test a1pms and simulator protocol versions (others are http only) -TESTED_PROTOCOLS="HTTP HTTPS" +sim_generate_policy_uuid + +if [ $USE_ISTIO -eq 0 ]; then + # Tested variants of REST/DMAAP/SDNC config + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + TESTED_VARIANTS="REST REST+SDNC" + else + TESTED_VARIANTS="REST DMAAP REST+SDNC DMAAP+SDNC" + fi + + #Test a1pms and simulator protocol versions (others are http only) + TESTED_PROTOCOLS="HTTP HTTPS" +else + if [ $USE_ISTIO -eq 1 ]; then + echo -e $RED"#########################################"$ERED + echo -e $RED"# No test of https when running with istio"$ERED + echo -e $RED"# No test of SDNC when running with istio"$ERED + echo -e $RED"#########################################"$ERED + fi + # Tested variants of REST/DMAAP/SDNC config + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + TESTED_VARIANTS="REST DMAAP" + else + TESTED_VARIANTS="REST" + fi + + #Test a1pms and simulator protocol versions (others are http only) + TESTED_PROTOCOLS="HTTP" +fi for __httpx in $TESTED_PROTOCOLS ; do for interface in $TESTED_VARIANTS ; do @@ -64,8 +93,80 @@ for __httpx in $TESTED_PROTOCOLS ; do # Clean container and start all needed containers # clean_environment + if [ $RUNMODE != "KUBE" ]; then + USE_ISTIO=0 + echo "ISTIO not supported by docker - setting USE-ISTIO=0" + fi + + if [ $USE_ISTIO -eq 1 ]; then + echo -e $RED"#########################################"$ERED + echo -e $RED"# Work around istio jwks cache"$ERED + echo -e $RED"# Cycle istiod down and up to clear cache"$ERED + echo "" + __kube_scale deployment istiod istio-system 0 + __kube_scale deployment istiod istio-system 1 + echo -e $RED"# Cycle istiod done" + echo -e $RED"#########################################"$ERED + + istio_enable_istio_namespace $KUBE_SIM_NAMESPACE + istio_enable_istio_namespace $KUBE_NONRTRIC_NAMESPACE + istio_enable_istio_namespace $KUBE_A1SIM_NAMESPACE + fi + + start_kube_proxy + if [ $USE_ISTIO -eq 1 ]; then + start_keycloak + + keycloak_api_obtain_admin_token + + keycloak_api_create_realm nrtrealm true 60 + keycloak_api_create_confidential_client nrtrealm a1pmsc + keycloak_api_generate_client_secret nrtrealm a1pmsc + keycloak_api_get_client_secret nrtrealm a1pmsc + keycloak_api_create_client_roles nrtrealm a1pmsc nrtrole + keycloak_api_map_client_roles nrtrealm a1pmsc nrtrole + + keycloak_api_get_client_token nrtrealm a1pmsc + + CLIENT_TOKEN=$(keycloak_api_read_client_token nrtrealm a1pmsc) + echo "CLIENT_TOKEN: "$CLIENT_TOKEN + + A1PMS_SEC=$(keycloak_api_read_client_secret nrtrealm a1pmsc) + echo "A1PMS_SEC: "$A1PMS_SEC + + # Protect ricsim-g3 + istio_req_auth_by_jwks ricsim-g1 $KUBE_A1SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS" + istio_auth_policy_by_issuer ricsim-g1 $KUBE_A1SIM_NAMESPACE KUBEPROXY + + istio_req_auth_by_jwksuri ricsim-g1 $KUBE_A1SIM_NAMESPACE nrtrealm + istio_auth_policy_by_realm ricsim-g1 $KUBE_A1SIM_NAMESPACE nrtrealm a1pmsc nrtrole + + # Protect ricsim-g2 + istio_req_auth_by_jwks ricsim-g2 $KUBE_A1SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS" + istio_auth_policy_by_issuer ricsim-g2 $KUBE_A1SIM_NAMESPACE KUBEPROXY + + istio_req_auth_by_jwksuri ricsim-g2 $KUBE_A1SIM_NAMESPACE nrtrealm + istio_auth_policy_by_realm ricsim-g2 $KUBE_A1SIM_NAMESPACE nrtrealm a1pmsc nrtrole + + # Protect ricsim-g3 + istio_req_auth_by_jwks ricsim-g3 $KUBE_A1SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS" + istio_auth_policy_by_issuer ricsim-g3 $KUBE_A1SIM_NAMESPACE KUBEPROXY + + istio_req_auth_by_jwksuri ricsim-g3 $KUBE_A1SIM_NAMESPACE nrtrealm + istio_auth_policy_by_realm ricsim-g3 $KUBE_A1SIM_NAMESPACE nrtrealm a1pmsc nrtrole + + # Protect CR + istio_req_auth_by_jwks $CR_APP_NAME $KUBE_SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS" + istio_auth_policy_by_issuer $CR_APP_NAME $KUBE_SIM_NAMESPACE KUBEPROXY + + istio_req_auth_by_jwksuri $CR_APP_NAME $KUBE_SIM_NAMESPACE nrtrealm + istio_auth_policy_by_realm $CR_APP_NAME $KUBE_SIM_NAMESPACE nrtrealm a1pmsc nrtrole + + a1pms_configure_sec nrtrealm a1pmsc $A1PMS_SEC + fi + if [ $__httpx == "HTTPS" ]; then use_cr_https use_a1pms_rest_https @@ -87,7 +188,12 @@ for __httpx in $TESTED_PROTOCOLS ; do use_simulator_https use_mr_https if [[ $interface = *"SDNC"* ]]; then - 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 fi if [[ $interface = *"DMAAP"* ]]; then use_a1pms_dmaap_https @@ -113,13 +219,15 @@ for __httpx in $TESTED_PROTOCOLS ; do sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json sim_put_policy_type 201 ricsim_g1_1 2 testdata/OSC/sim_2.json - if [ "$A1PMS_VERSION" == "V2" ]; then - start_ric_simulators ricsim_g3 1 STD_2.0.0 - sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json - sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json - fi + start_ric_simulators ricsim_g3 1 STD_2.0.0 + sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json + sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json - start_mr + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + : + else + start_mr + fi start_cr 1 @@ -129,82 +237,71 @@ for __httpx in $TESTED_PROTOCOLS ; do start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE fi + if [[ $interface = *"SDNC"* ]]; then start_sdnc - prepare_consul_config SDNC ".consul_config.json" + controller_api_wait_for_status_ok 200 ricsim_g1_1 + prepare_a1pms_config SDNC ".a1pms_config.json" else - prepare_consul_config NOSDNC ".consul_config.json" + prepare_a1pms_config NOSDNC ".a1pms_config.json" fi if [ $RUNMODE == "KUBE" ]; then - a1pms_load_config ".consul_config.json" + a1pms_load_config ".a1pms_config.json" else - if [[ "$A1PMS_FEATURE_LEVEL" == *"NOCONSUL"* ]]; then - #Temporary switch to http/https if dmaap use. Otherwise it is not possibble to push config - if [ $__httpx == "HTTPS" ]; then - use_a1pms_rest_https - else - use_a1pms_rest_http - fi + #Temporary switch to http/https if dmaap use. Otherwise it is not possible to push config + if [ $__httpx == "HTTPS" ]; then + use_a1pms_rest_https + else + use_a1pms_rest_http + fi - if [[ $interface != *"DMAAP"* ]]; then - echo "{}" > ".consul_config_incorrect.json" - a1pms_api_put_configuration 400 ".consul_config_incorrect.json" - fi + if [[ $interface != *"DMAAP"* ]]; then + echo "{}" > ".a1pms_config_incorrect.json" + a1pms_api_put_configuration 400 ".a1pms_config_incorrect.json" + fi - a1pms_api_put_configuration 200 ".consul_config.json" - a1pms_api_get_configuration 200 ".consul_config.json" - if [ $__httpx == "HTTPS" ]; then - if [[ $interface = *"DMAAP"* ]]; then - use_a1pms_dmaap_https - else - use_a1pms_rest_https - fi + a1pms_api_put_configuration 200 ".a1pms_config.json" + a1pms_api_get_configuration 200 ".a1pms_config.json" + if [ $__httpx == "HTTPS" ]; then + if [[ $interface = *"DMAAP"* ]]; then + use_a1pms_dmaap_https else - if [[ $interface = *"DMAAP"* ]]; then - use_a1pms_dmaap_http - else - use_a1pms_rest_http - fi + use_a1pms_rest_https fi - else - start_consul_cbs - consul_config_app ".consul_config.json" + if [[ $interface = *"DMAAP"* ]]; then + use_a1pms_dmaap_http + else + use_a1pms_rest_http + fi fi fi - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_equal json:rics 3 300 - - a1pms_equal json:policy-types 5 120 - - a1pms_equal json:policies 0 - - a1pms_equal json:policy-instances 0 - else - a1pms_equal json:rics 2 300 + a1pms_equal json:rics 3 300 - a1pms_equal json:policy_schemas 3 120 + a1pms_equal json:policy-types 5 120 - a1pms_equal json:policy_types 3 + a1pms_equal json:policies 0 - a1pms_equal json:policies 0 + a1pms_equal json:policy-instances 0 - a1pms_equal json:policy_ids 0 - fi + cr_equal 0 received_callbacks 3 120 + cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1 - if [ "$A1PMS_VERSION" == "V2" ]; then - cr_equal 0 received_callbacks 3 120 - cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1 + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + : + else + mr_equal requests_submitted 0 fi - mr_equal requests_submitted 0 echo "############################################" echo "############## Health check ################" echo "############################################" + sleep_wait 120 "Let A1PMS configuration take effect" + a1pms_api_get_status 200 a1pms_api_get_status_root 200 @@ -291,117 +388,71 @@ for __httpx in $TESTED_PROTOCOLS ; do echo "############## RIC Repository ##############" echo "############################################" - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE" - else - a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE" - fi + a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE" + a1pms_api_get_rics 200 1 "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE" a1pms_api_get_rics 404 47 a1pms_api_get_rics 404 "test" - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_api_get_ric 200 me1_ricsim_g1_1 NORIC "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE" - - a1pms_api_get_ric 200 me2_ricsim_g1_1 NORIC "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE" - - a1pms_api_get_ric 200 me1_ricsim_g2_1 NORIC "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE" - - a1pms_api_get_ric 200 me2_ricsim_g2_1 NORIC "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE" - - a1pms_api_get_ric 200 me1_ricsim_g3_1 NORIC "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE" - - a1pms_api_get_ric 200 me2_ricsim_g3_1 NORIC "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE" + a1pms_api_get_ric 200 me1_ricsim_g1_1 NORIC "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE" - a1pms_api_get_ric 200 NOME ricsim_g1_1 "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE" + a1pms_api_get_ric 200 me2_ricsim_g1_1 NORIC "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE" - a1pms_api_get_ric 200 NOME ricsim_g2_1 "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE" + a1pms_api_get_ric 200 me1_ricsim_g2_1 NORIC "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE" - a1pms_api_get_ric 200 NOME ricsim_g3_1 "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE" + a1pms_api_get_ric 200 me2_ricsim_g2_1 NORIC "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE" - a1pms_api_get_ric 404 NOME test1 + a1pms_api_get_ric 200 me1_ricsim_g3_1 NORIC "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE" - a1pms_api_get_ric 404 test NORIC + a1pms_api_get_ric 200 me2_ricsim_g3_1 NORIC "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE" - a1pms_api_get_ric 400 me1_ricsim_g1_1 ricsim_g1_1 + a1pms_api_get_ric 200 NOME ricsim_g1_1 "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE" - a1pms_api_get_ric 400 me1_ricsim_g1_1 TESTRIC + a1pms_api_get_ric 200 NOME ricsim_g2_1 "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE" - a1pms_api_get_ric 400 TESTME ricsim_g1_1 + a1pms_api_get_ric 200 NOME ricsim_g3_1 "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE" - else - a1pms_api_get_ric 200 me1_ricsim_g1_1 ricsim_g1_1 + a1pms_api_get_ric 404 NOME test1 - a1pms_api_get_ric 200 me2_ricsim_g1_1 ricsim_g1_1 + a1pms_api_get_ric 404 test NORIC - a1pms_api_get_ric 200 me1_ricsim_g2_1 ricsim_g2_1 + a1pms_api_get_ric 400 me1_ricsim_g1_1 ricsim_g1_1 - a1pms_api_get_ric 200 me2_ricsim_g2_1 ricsim_g2_1 + a1pms_api_get_ric 400 me1_ricsim_g1_1 TESTRIC - a1pms_api_get_ric 404 test - fi + a1pms_api_get_ric 400 TESTME ricsim_g1_1 echo "############################################" echo "########### A1 Policy Management ###########" echo "############################################" - if [ "$A1PMS_VERSION" == "V2" ]; then - deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx" - #Behaviour accepted for now - a1pms_api_get_policy_type 200 1 testdata/OSC/1-a1pms-modified.json - deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx" - #Behaviour accepted for now - a1pms_api_get_policy_type 200 2 testdata/OSC/2-a1pms-modified.json - deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx" - #Behaviour accepted for now - a1pms_api_get_policy_type 200 STD_QOS_0_2_0 testdata/STD2/qos-a1pms-modified.json - deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx" - #Behaviour accepted for now - a1pms_api_get_policy_type 200 STD_QOS2_0.1.0 testdata/STD2/qos2-a1pms-modified.json - - a1pms_api_get_policy_type 404 3 - else - deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx" - #Behaviour accepted for now - a1pms_api_get_policy_schema 200 1 testdata/OSC/1-a1pms-modified.json - deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx" - #Behaviour accepted for now - a1pms_api_get_policy_schema 200 2 testdata/OSC/2-a1pms-modified.json - - a1pms_api_get_policy_schema 404 3 - fi + deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx" + #Behaviour accepted for now + a1pms_api_get_policy_type 200 1 testdata/OSC/1-a1pms-modified.json + deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx" + #Behaviour accepted for now + a1pms_api_get_policy_type 200 2 testdata/OSC/2-a1pms-modified.json + deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx" + #Behaviour accepted for now + a1pms_api_get_policy_type 200 STD_QOS_0_2_0 testdata/STD2/qos-a1pms-modified.json + deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx" + #Behaviour accepted for now + a1pms_api_get_policy_type 200 STD_QOS2_0.1.0 testdata/STD2/qos2-a1pms-modified.json - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_api_get_policy_schemas 404 - else - deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx" - #Behaviour accepted for now - a1pms_api_get_policy_schemas 200 NORIC testdata/OSC/1-a1pms-modified.json testdata/OSC/2-a1pms-modified.json NOFILE - deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx" - #Behaviour accepted for now - a1pms_api_get_policy_schemas 200 ricsim_g1_1 testdata/OSC/1-a1pms-modified.json testdata/OSC/2-a1pms-modified.json + a1pms_api_get_policy_type 404 3 - a1pms_api_get_policy_schemas 200 ricsim_g2_1 NOFILE + a1pms_api_get_policy_schemas 404 - a1pms_api_get_policy_schemas 404 test - fi - - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_api_get_policy_types 200 NORIC 1 2 EMPTY STD_QOS_0_2_0 STD_QOS2_0.1.0 - else - a1pms_api_get_policy_types 200 NORIC 1 2 EMPTY - fi + a1pms_api_get_policy_types 200 NORIC 1 2 EMPTY STD_QOS_0_2_0 STD_QOS2_0.1.0 a1pms_api_get_policy_types 200 ricsim_g1_1 1 2 a1pms_api_get_policy_types 200 ricsim_g2_1 EMPTY - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_api_get_policy_types 200 ricsim_g3_1 STD_QOS_0_2_0 STD_QOS2_0.1.0 - fi + a1pms_api_get_policy_types 200 ricsim_g3_1 STD_QOS_0_2_0 STD_QOS2_0.1.0 a1pms_api_get_policy_types 404 dummy-ric @@ -409,11 +460,8 @@ for __httpx in $TESTED_PROTOCOLS ; do a1pms_api_put_service 201 "service10" 3600 "$CR_SERVICE_APP_PATH_0/1" - if [ "$A1PMS_VERSION" == "V2" ]; then - notificationurl=$CR_SERVICE_APP_PATH_0"/test" - else - notificationurl="" - fi + notificationurl=$CR_SERVICE_APP_PATH_0"/test" + if [[ $interface != *"DMAAP"* ]]; then # Badly formatted json is not possible to send via dmaap a1pms_api_put_policy 400 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi_bad_template.json @@ -436,74 +484,49 @@ for __httpx in $TESTED_PROTOCOLS ; do a1pms_api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 true $notificationurl testdata/STD/pi1_template.json a1pms_api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 false $notificationurl testdata/STD/pi1_template.json - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json - a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json + a1pms_api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json + a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json - a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 true $notificationurl testdata/STD2/pi_qos2_template.json - a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 false $notificationurl testdata/STD2/pi_qos2_template.json - fi + a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 true $notificationurl testdata/STD2/pi_qos2_template.json + a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 false $notificationurl testdata/STD2/pi_qos2_template.json a1pms_api_get_policy_status 404 1 a1pms_api_get_policy_status 404 2 VAL='NOT IN EFFECT' a1pms_api_get_policy_status 200 5000 OSC "$VAL" "false" a1pms_api_get_policy_status 200 5100 STD "UNDEFINED" - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_api_get_policy_status 200 5200 STD2 EMPTY EMPTY - fi + a1pms_api_get_policy_status 200 5200 STD2 EMPTY EMPTY deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx" #kept until decision #a1pms_equal json:policies 2 #Allow 3 for now - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_equal json:policies 4 - else - a1pms_equal json:policies 3 - fi + a1pms_equal json:policies 4 deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx" #kept until decision #a1pms_equal json:policy_ids 2 #Allow 3 for now - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_equal json:policy-instances 4 - else - a1pms_equal json:policy_ids 3 - fi + a1pms_equal json:policy-instances 4 deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx" #kept until decision #a1pms_api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100 #Allow policy create with unregistered service for now - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100 2000 5200 - else - a1pms_api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100 2000 - fi + a1pms_api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100 2000 5200 deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx" #kept until decision #a1pms_api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000 #Allow policy create with unregistered service for now - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000 2000 - - a1pms_api_get_policy_ids 200 ricsim_g2_1 NOSERVICE NOTYPE 5100 + a1pms_api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000 2000 - a1pms_api_get_policy_ids 200 ricsim_g3_1 NOSERVICE NOTYPE 5200 - - a1pms_api_get_policy_ids 200 NORIC "service10" NOTYPE 5000 5100 5200 - else - a1pms_api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000 2000 + a1pms_api_get_policy_ids 200 ricsim_g2_1 NOSERVICE NOTYPE 5100 - a1pms_api_get_policy_ids 200 ricsim_g2_1 NOSERVICE NOTYPE 5100 + a1pms_api_get_policy_ids 200 ricsim_g3_1 NOSERVICE NOTYPE 5200 - - a1pms_api_get_policy_ids 200 NORIC "service10" NOTYPE 5000 5100 - fi + a1pms_api_get_policy_ids 200 NORIC "service10" NOTYPE 5000 5100 5200 deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx" #kept until decision @@ -514,27 +537,17 @@ for __httpx in $TESTED_PROTOCOLS ; do a1pms_api_get_policy_ids 200 NORIC NOSERVICE 2 NOID - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_api_get_policy_ids 200 NORIC NOSERVICE STD_QOS2_0.1.0 5200 - fi + a1pms_api_get_policy_ids 200 NORIC NOSERVICE STD_QOS2_0.1.0 5200 a1pms_api_get_policy_ids 200 ricsim_g2_1 NOSERVICE 1 NOID - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_api_get_policy 200 5000 testdata/OSC/pi1_template.json "service10" ricsim_g1_1 1 false $notificationurl + a1pms_api_get_policy 200 5000 testdata/OSC/pi1_template.json "service10" ricsim_g1_1 1 false $notificationurl - a1pms_api_get_policy 200 5100 testdata/STD/pi1_template.json "service10" ricsim_g2_1 NOTYPE false $notificationurl + a1pms_api_get_policy 200 5100 testdata/STD/pi1_template.json "service10" ricsim_g2_1 NOTYPE false $notificationurl - a1pms_api_get_policy 200 5200 testdata/STD2/pi_qos2_template.json "service10" ricsim_g3_1 STD_QOS2_0.1.0 false $notificationurl + a1pms_api_get_policy 200 5200 testdata/STD2/pi_qos2_template.json "service10" ricsim_g3_1 STD_QOS2_0.1.0 false $notificationurl - a1pms_api_get_policies 200 ricsim_g1_1 "service10" 1 5000 ricsim_g1_1 "service10" 1 false $notificationurl testdata/OSC/pi1_template.json - else - a1pms_api_get_policy 200 5000 testdata/OSC/pi1_template.json - - a1pms_api_get_policy 200 5100 testdata/STD/pi1_template.json - - a1pms_api_get_policies 200 ricsim_g1_1 "service10" 1 5000 ricsim_g1_1 "service10" 1 testdata/OSC/pi1_template.json - fi + a1pms_api_get_policies 200 ricsim_g1_1 "service10" 1 5000 ricsim_g1_1 "service10" 1 false $notificationurl testdata/OSC/pi1_template.json deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx" #kept until decision @@ -546,33 +559,20 @@ for __httpx in $TESTED_PROTOCOLS ; do a1pms_api_delete_policy 204 5000 - if [ "$A1PMS_VERSION" == "V2" ]; then - - a1pms_api_delete_policy 204 5200 - fi + a1pms_api_delete_policy 204 5200 a1pms_equal json:policies 1 - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_equal json:policy-instances 1 - else - a1pms_equal json:policy_ids 1 - fi + a1pms_equal json:policy-instances 1 a1pms_api_delete_policy 204 5100 a1pms_equal json:policies 0 - if [ "$A1PMS_VERSION" == "V2" ]; then - a1pms_equal json:policy-instances 0 - else - a1pms_equal json:policy_ids 0 - fi + a1pms_equal json:policy-instances 0 - if [ "$A1PMS_VERSION" == "V2" ]; then - cr_equal 0 received_callbacks 3 - fi + cr_equal 0 received_callbacks 3 if [[ $interface = *"DMAAP"* ]]; then mr_greater requests_submitted 0 @@ -583,19 +583,20 @@ for __httpx in $TESTED_PROTOCOLS ; do mr_equal current_requests 0 mr_equal current_responses 0 else - mr_equal requests_submitted 0 + if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then + : + else + mr_equal requests_submitted 0 + fi fi - - if [[ $interface = *"SDNC"* ]]; then - sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME - sim_contains_str ricsim_g2_1 remote_hosts $SDNC_APP_NAME - if [ "$A1PMS_VERSION" == "V2" ]; then + if [ $USE_ISTIO -eq 0 ]; then + if [[ $interface = *"SDNC"* ]]; then + sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME + sim_contains_str ricsim_g2_1 remote_hosts $SDNC_APP_NAME sim_contains_str ricsim_g3_1 remote_hosts $SDNC_APP_NAME - fi - else - sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME - sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME - if [ "$A1PMS_VERSION" == "V2" ]; then + else + sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME + sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME fi fi