X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Fauto-test%2FFTC1100.sh;h=b8c304516f47b3ff2c73537fedb7366a1400a70b;hb=a00565c678ddd48145f71fa41f9481cacee8d1d4;hp=090481ac3165af36f800615667eda869aeb45ec2;hpb=4c6dfa1378c22d2ebb4b8e271d2e000f98d2a2c2;p=nonrtric.git

diff --git a/test/auto-test/FTC1100.sh b/test/auto-test/FTC1100.sh
index 090481ac..b8c30451 100755
--- a/test/auto-test/FTC1100.sh
+++ b/test/auto-test/FTC1100.sh
@@ -68,6 +68,7 @@ if [ $USE_ISTIO -eq 1 ]; then
     __kube_scale deployment istiod istio-system 1
     echo -e $RED"# Cycle istiod done"
     echo -e $RED"#########################################"$ERED
+    echo ""
 
     istio_enable_istio_namespace $KUBE_SIM_NAMESPACE
     istio_enable_istio_namespace $KUBE_NONRTRIC_NAMESPACE
@@ -155,6 +156,11 @@ fi
 
 start_cr 1
 
+if [ $USE_ISTIO -eq 1 ]; then
+    echo "Sleep 120 to let istio settle - enabling istio on workloads may cause initial dns disturbances - temporary unavailable dns names"
+    sleep 120
+fi
+
 CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK"
 CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK"
 #Targets for ei jobs
@@ -1448,7 +1454,7 @@ ics_api_edp_get_type_2 200 type101 testdata/ics/info-type-1.json
 ics_api_edp_put_producer_2 201 prod-ia $CB_JOB/prod-ia $CB_SV/prod-ia type101
 ics_api_edp_put_producer_2 200 prod-ia $CB_JOB/prod-ia $CB_SV/prod-ia type101
 
-if [[ "$ICS_FEATURE_LEVEL" == *"RESP_CODE_CHANGE_1" ]]; then
+if [[ "$ICS_FEATURE_LEVEL" == *"RESP_CODE_CHANGE_1"* ]]; then
     ics_api_edp_delete_type_2 409 type101
 else
     ics_api_edp_delete_type_2 406 type101
@@ -1968,25 +1974,44 @@ else
     cr_equal 0 received_callbacks 12
 fi
 ### Test of pre and post validation
+if [[ "$ICS_FEATURE_LEVEL" != *"DEFAULT_TYPE_VALIDATION"* ]]; then
+    ics_api_idc_get_type_ids 200 type1 type2 type4 type6 type101 type102 type104 type106
+    ics_api_idc_put_job 404 job150 type150 $TARGET150 info-owner-1 $INFOSTATUS150 testdata/ics/job-template.json VALIDATE
+    ics_api_idc_put_job 201 job160 type160 $TARGET160 info-owner-1 $INFOSTATUS160 testdata/ics/job-template.json
 
-ics_api_idc_get_type_ids 200 type1 type2 type4 type6 type101 type102 type104 type106
-ics_api_idc_put_job 404 job150 type150 $TARGET150 info-owner-1 $INFOSTATUS150 testdata/ics/job-template.json VALIDATE
-ics_api_idc_put_job 201 job160 type160 $TARGET160 info-owner-1 $INFOSTATUS160 testdata/ics/job-template.json
 
-ics_api_idc_get_job_status2 404 job150
-ics_api_idc_get_job_status2 200 job160 DISABLED EMPTYPROD 60
+    ics_api_idc_get_job_status2 404 job150
+    ics_api_idc_get_job_status2 200 job160 DISABLED EMPTYPROD 60
 
-prodstub_arm_producer 200 prod-ig
-prodstub_arm_job_create 200 prod-ig job150
-prodstub_arm_job_create 200 prod-ig job160
+    prodstub_arm_producer 200 prod-ig
+    prodstub_arm_job_create 200 prod-ig job150
+    prodstub_arm_job_create 200 prod-ig job160
 
-ics_api_edp_put_producer_2 201 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig NOTYPE
-ics_api_edp_get_producer_status 200 prod-ig ENABLED 360
+    ics_api_edp_put_producer_2 201 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig NOTYPE
+    ics_api_edp_get_producer_status 200 prod-ig ENABLED 360
 
-ics_api_edp_get_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig EMPTY
+    ics_api_edp_get_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig EMPTY
 
-ics_api_idc_get_job_status2 404 job150
-ics_api_idc_get_job_status2 200 job160 DISABLED EMPTYPROD 60
+    ics_api_idc_get_job_status2 404 job150
+    ics_api_idc_get_job_status2 200 job160 DISABLED EMPTYPROD 60
+else
+    ics_api_idc_get_type_ids 200 type1 type2 type4 type6 type101 type102 type104 type106
+    ics_api_idc_put_job 404 job150 type150 $TARGET150 info-owner-1 $INFOSTATUS150 testdata/ics/job-template.json VALIDATE
+
+    ics_api_idc_get_job_status2 404 job150
+
+    prodstub_arm_producer 200 prod-ig
+    prodstub_arm_job_create 200 prod-ig job150
+    prodstub_arm_job_create 200 prod-ig job160
+
+    ics_api_edp_put_producer_2 201 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig NOTYPE
+    ics_api_edp_get_producer_status 200 prod-ig ENABLED 360
+
+    ics_api_edp_get_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig EMPTY
+
+    ics_api_idc_get_job_status2 404 job150
+    #ics_api_idc_get_job_status2 200 job160 DISABLED EMPTYPROD 60
+fi
 
 prodstub_arm_type 200 prod-ig type160
 
@@ -2000,12 +2025,14 @@ ics_api_edp_get_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig type160
 ics_api_idc_put_job 404 job150 type150 $TARGET150 info-owner-1 $INFOSTATUS150 testdata/ics/job-template.json VALIDATE
 
 ics_api_idc_get_job_status2 404 job150
-ics_api_idc_get_job_status2 200 job160 ENABLED 1 prod-ig 60
+if [[ "$ICS_FEATURE_LEVEL" != *"DEFAULT_TYPE_VALIDATION"* ]]; then
+    ics_api_idc_get_job_status2 200 job160 ENABLED 1 prod-ig 60
 
-prodstub_check_jobdata_3 200 prod-ig job160 type160 $TARGET160 info-owner-1 testdata/ics/job-template.json
+    prodstub_check_jobdata_3 200 prod-ig job160 type160 $TARGET160 info-owner-1 testdata/ics/job-template.json
 
-prodstub_equal create/prod-ig/job160 1
-prodstub_equal delete/prod-ig/job160 0
+    prodstub_equal create/prod-ig/job160 1
+    prodstub_equal delete/prod-ig/job160 0
+fi
 
 prodstub_arm_type 200 prod-ig type150
 
@@ -2025,6 +2052,10 @@ ics_api_edp_get_producer_status 200 prod-ig ENABLED 360
 
 ics_api_edp_get_producer_2 200 prod-ig $CB_JOB/prod-ig $CB_SV/prod-ig type160 type150
 
+if [[ "$ICS_FEATURE_LEVEL" == *"DEFAULT_TYPE_VALIDATION"* ]]; then
+    ics_api_idc_put_job 201 job160 type160 $TARGET160 info-owner-1 $INFOSTATUS160 testdata/ics/job-template.json
+fi
+
 ics_api_idc_get_job_status2 404 job150
 ics_api_idc_get_job_status2 200 job160 ENABLED  1 prod-ig
 
@@ -2044,7 +2075,7 @@ fi
 
 if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
 
-    if [[ "$ICS_FEATURE_LEVEL" == *"RESP_CODE_CHANGE_1" ]]; then
+    if [[ "$ICS_FEATURE_LEVEL" == *"RESP_CODE_CHANGE_1"* ]]; then
         ics_api_edp_delete_type_2 409 type104
     else
         ics_api_edp_delete_type_2 406 type104