X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fauto-test%2FFTC_HELM-RECIPE.sh;fp=test%2Fauto-test%2FFTC_HELM-RECEPIE.sh;h=8c13e65869f99cb535f1c2429bbe57269fe6db4e;hb=c963b73942867f631f9e5708e28025140afcb893;hp=a9f5e5ed32abd3ed60cf3ba339849dfc9e8b6fa4;hpb=38c1f88849d9b529007ac07daeeca2ca0291793b;p=nonrtric.git diff --git a/test/auto-test/FTC_HELM-RECEPIE.sh b/test/auto-test/FTC_HELM-RECIPE.sh similarity index 92% rename from test/auto-test/FTC_HELM-RECEPIE.sh rename to test/auto-test/FTC_HELM-RECIPE.sh index a9f5e5ed..8c13e658 100755 --- a/test/auto-test/FTC_HELM-RECEPIE.sh +++ b/test/auto-test/FTC_HELM-RECIPE.sh @@ -52,7 +52,11 @@ use_sdnc_https use_simulator_https use_ecs_rest_https use_prod_stub_https -use_rapp_catalogue_http +if [ $ECS_VERSION == "V1-1" ]; then + use_rapp_catalogue_http # https not yet supported +else + use_rapp_catalogue_https +fi echo -e "$RED CHECK WHY RC HTTPS DOES NOT WORK $ERED" @@ -92,7 +96,7 @@ start_cr start_prod_stub -start_ecs +start_ecs NOPROXY set_ecs_trace @@ -274,8 +278,11 @@ else fi # Check the job data in the producer -prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json - +if [ $ECS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json +else + prodstub_check_jobdata_2 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ecs/job-template.json +fi ## Create a second job for prod-a ## job2 - prod-a @@ -286,8 +293,11 @@ else fi # Check the job data in the producer -prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json - +if [ $ECS_VERSION == "V1-1" ]; then + prodstub_check_jobdata 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json +else + prodstub_check_jobdata_2 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ecs/job-template.json +fi echo "ADD EVENT/STATUS CHECK"