Add functionality to rAPP Catalogue
[nonrtric.git] / test / common / ecs_api_functions.sh
index 3c37299..dfa6e4b 100644 (file)
 #Function prefix: ecs_api_a1
 
 # API Test function: GET /A1-EI​/v1​/eitypes​/{eiTypeId}​/eijobs
-# args: <response-code>
+# args: <response-code> <type-id>  <owner-id>|NOOWNER [ EMPTY | <job-id>+ ]
 # (Function for test scripts)
 ecs_api_a1_get_job_ids() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
     echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
        ((RES_TEST++))
 
+       # Valid number of parameters 3,4,5,6 etc
     if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+               __print_err "<response-code> <type-id>  <owner-id>|NOOWNER [ EMPTY | <job-id>+ ]" $@
+               return 1
+       fi
+       owner=""
+       if [ $3 != "NOWNER" ]; then
+               owner="?owner="$3
+       fi
+
+       query="/A1-EI/v1/eitypes/$2/eijobs$owner"
+    res="$(__do_curl_to_api ECS GET $query)"
+    status=${res:${#res}-3}
+
+       if [ $status -ne $1 ]; then
+               echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
 
+       if [ $# -gt 3 ]; then
+               body=${res:0:${#res}-3}
+               targetJson="["
+
+               for pid in ${@:4} ; do
+                       if [ "$targetJson" != "[" ]; then
+                               targetJson=$targetJson","
+                       fi
+                       if [ $pid != "EMPTY" ]; then
+                               targetJson=$targetJson"\"$pid\""
+                       fi
+               done
+
+               targetJson=$targetJson"]"
+               echo " TARGET JSON: $targetJson" >> $HTTPLOG
+               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+               if [ $res -ne 0 ]; then
+                       echo -e $RED" FAIL, returned body not correct"$ERED
+                       ((RES_FAIL++))
+                       __check_stop_at_error
+                       return 1
+               fi
+       fi
+
        ((RES_PASS++))
        echo -e $GREEN" PASS"$EGREEN
        return 0
 }
 
 # API Test function: GET ​/A1-EI​/v1​/eitypes​/{eiTypeId}
-# args: <response-code>
+# args: <response-code> <type-id> [<schema-file>]
 # (Function for test scripts)
 ecs_api_a1_get_type() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
     echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
        ((RES_TEST++))
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+    if [ $# -lt 2 ] || [ $# -gt 3 ]; then
+               __print_err "<response-code> <type-id> [<schema-file>]" $@
+               return 1
+       fi
+
+       query="/A1-EI/v1/eitypes/$2"
+    res="$(__do_curl_to_api ECS GET $query)"
+    status=${res:${#res}-3}
+
+       if [ $status -ne $1 ]; then
+               echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
 
+       if [ $# -eq 3 ]; then
+               body=${res:0:${#res}-3}
+               if [ -f $3 ]; then
+                       schema=$(cat $3)
+               else
+                       echo -e $RED" FAIL. Schema file "$3", does not exist"$ERED
+                       ((RES_FAIL++))
+                       __check_stop_at_error
+                       return 1
+               fi
+               targetJson="{\"eiJobParametersSchema\":$schema}"
+               echo " TARGET JSON: $targetJson" >> $HTTPLOG
+               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+               if [ $res -ne 0 ]; then
+                       echo -e $RED" FAIL, returned body not correct"$ERED
+                       ((RES_FAIL++))
+                       __check_stop_at_error
+                       return 1
+               fi
+       fi
+
+
        ((RES_PASS++))
        echo -e $GREEN" PASS"$EGREEN
        return 0
 }
 
-# API Test function: GET ​/A1-EI​/v1​/eitypes
-# args: <response-code>
+# API Test function: GET /A1-EI/v1/eitypes
+# args: <response-code> [ (EMPTY | [<type-id>]+) ]
 # (Function for test scripts)
 ecs_api_a1_get_type_ids() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
@@ -77,9 +152,42 @@ ecs_api_a1_get_type_ids() {
        ((RES_TEST++))
 
     if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+               __print_err "<response-code> [ (EMPTY | [<type-id>]+) ]" $@
+               return 1
+       fi
+
+       query="/A1-EI/v1/eitypes"
+    res="$(__do_curl_to_api ECS GET $query)"
+    status=${res:${#res}-3}
+
+       if [ $status -ne $1 ]; then
+               echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
+       if [ $# -gt 1 ]; then
+               body=${res:0:${#res}-3}
+               targetJson="["
+               if [ $2 != "EMPTY" ]; then
+                       for pid in ${@:2} ; do
+                               if [ "$targetJson" != "[" ]; then
+                                       targetJson=$targetJson","
+                               fi
+                               targetJson=$targetJson"\"$pid\""
+                       done
+               fi
+               targetJson=$targetJson"]"
+               echo " TARGET JSON: $targetJson" >> $HTTPLOG
+               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+               if [ $res -ne 0 ]; then
+                       echo -e $RED" FAIL, returned body not correct"$ERED
+                       ((RES_FAIL++))
+                       __check_stop_at_error
+                       return 1
+               fi
+       fi
 
        ((RES_PASS++))
        echo -e $GREEN" PASS"$EGREEN
@@ -87,51 +195,121 @@ ecs_api_a1_get_type_ids() {
 }
 
 # API Test function: GET ​/A1-EI​/v1​/eitypes​/{eiTypeId}​/eijobs​/{eiJobId}​/status
-# args: <response-code>
+# args: <response-code> <type-id> <job-id> [<status>]
 # (Function for test scripts)
 ecs_api_a1_get_job_status() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
     echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
        ((RES_TEST++))
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+    if [ $# -ne 3 ] && [ $# -ne 4 ]; then
+               __print_err "<response-code> <type-id> <job-id>" $@
                return 1
        fi
 
+       query="/A1-EI/v1/eitypes/$2/eijobs/$3/status"
+    res="$(__do_curl_to_api ECS GET $query)"
+    status=${res:${#res}-3}
+
+       if [ $status -ne $1 ]; then
+               echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
+               return 1
+       fi
+       if [ $# -eq 4 ]; then
+               body=${res:0:${#res}-3}
+               targetJson="{\"operationalState\": \"$4\"}"
+               echo " TARGET JSON: $targetJson" >> $HTTPLOG
+               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+               if [ $res -ne 0 ]; then
+                       echo -e $RED" FAIL, returned body not correct"$ERED
+                       ((RES_FAIL++))
+                       __check_stop_at_error
+                       return 1
+               fi
+       fi
+
        ((RES_PASS++))
        echo -e $GREEN" PASS"$EGREEN
        return 0
 }
 
 # API Test function: GET ​/A1-EI​/v1​/eitypes​/{eiTypeId}​/eijobs​/{eiJobId}
-# args: <response-code>
+# args: <response-code> <type-id> <job-id> [<target-url> <owner-id> <template-job-file>]
 # (Function for test scripts)
 ecs_api_a1_get_job() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
     echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
        ((RES_TEST++))
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+    if [ $# -ne 3 ] && [ $# -ne 6 ]; then
+               __print_err "<response-code> <type-id> <job-id> [<target-url> <owner-id> <template-job-file>]" $@
+               return 1
+       fi
+
+       query="/A1-EI/v1/eitypes/$2/eijobs/$3"
+    res="$(__do_curl_to_api ECS GET $query)"
+    status=${res:${#res}-3}
+
+       if [ $status -ne $1 ]; then
+               echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
 
+       if [ $# -eq 6 ]; then
+               body=${res:0:${#res}-3}
+
+               if [ -f $6 ]; then
+                       jobfile=$(cat $6)
+                       jobfile=$(echo "$jobfile" | sed "s/XXXX/$3/g")
+               else
+                       echo -e $RED" FAIL. Job template file "$6", does not exist"$ERED
+                       ((RES_FAIL++))
+                       __check_stop_at_error
+                       return 1
+               fi
+               targetJson="{\"targetUri\": \"$4\",\"jobOwner\": \"$5\",\"jobParameters\": $jobfile}"
+               echo " TARGET JSON: $targetJson" >> $HTTPLOG
+               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+               if [ $res -ne 0 ]; then
+                       echo -e $RED" FAIL, returned body not correct"$ERED
+                       ((RES_FAIL++))
+                       __check_stop_at_error
+                       return 1
+               fi
+       fi
+
        ((RES_PASS++))
        echo -e $GREEN" PASS"$EGREEN
        return 0
 }
 
 # API Test function: DELETE ​/A1-EI​/v1​/eitypes​/{eiTypeId}​/eijobs​/{eiJobId}
-# args: <response-code>
+# args: <response-code> <type-id> <job-id>
 # (Function for test scripts)
 ecs_api_a1_delete_job() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
     echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
        ((RES_TEST++))
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+    if [ $# -lt 3 ]; then
+               __print_err "<response-code> <type-id> <job-id>" $@
+               return 1
+       fi
+
+       query="/A1-EI/v1/eitypes/$2/eijobs/$3"
+    res="$(__do_curl_to_api ECS DELETE $query)"
+    status=${res:${#res}-3}
+
+       if [ $status -ne $1 ]; then
+               echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
 
@@ -141,15 +319,39 @@ ecs_api_a1_delete_job() {
 }
 
 # API Test function: PUT ​/A1-EI​/v1​/eitypes​/{eiTypeId}​/eijobs​/{eiJobId}
-# args: <response-code>
+# args: <response-code> <type-id> <job-id> <target-url> <owner-id> <template-job-file>
 # (Function for test scripts)
 ecs_api_a1_put_job() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
     echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
        ((RES_TEST++))
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+    if [ $# -lt 6 ]; then
+               __print_err "<response-code> <type-id> <job-id> <target-url> <owner-id> <template-job-file>" $@
+               return 1
+       fi
+       if [ -f $6 ]; then
+               jobfile=$(cat $6)
+               jobfile=$(echo "$jobfile" | sed "s/XXXX/$3/g")
+       else
+               echo -e $RED" FAIL. Job template file "$6", does not exist"$ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
+               return 1
+       fi
+
+       inputJson="{\"targetUri\": \"$4\",\"jobOwner\": \"$5\",\"jobParameters\": $jobfile}"
+       file="./tmp/.p.json"
+       echo "$inputJson" > $file
+
+       query="/A1-EI/v1/eitypes/$2/eijobs/$3"
+    res="$(__do_curl_to_api ECS PUT $query $file)"
+    status=${res:${#res}-3}
+
+       if [ $status -ne $1 ]; then
+               echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
 
@@ -165,7 +367,7 @@ ecs_api_a1_put_job() {
 # Function prefix: ecs_api_edp
 
 # API Test function: GET /ei-producer/v1/eitypes
-# args: <response-code>
+# args: <response-code> [ EMPTY | <type-id>+]
 # (Function for test scripts)
 ecs_api_edp_get_type_ids() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
@@ -173,28 +375,86 @@ ecs_api_edp_get_type_ids() {
        ((RES_TEST++))
 
     if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+               __print_err "<response-code> [ EMPTY | <type-id>+]" $@
+               return 1
+       fi
+
+       query="/ei-producer/v1/eitypes"
+    res="$(__do_curl_to_api ECS GET $query)"
+    status=${res:${#res}-3}
+
+       if [ $status -ne $1 ]; then
+               echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
 
+       if [ $# -gt 1 ]; then
+               body=${res:0:${#res}-3}
+               targetJson="["
+               if [ $2 != "EMPTY" ]; then
+                       for pid in ${@:2} ; do
+                               if [ "$targetJson" != "[" ]; then
+                                       targetJson=$targetJson","
+                               fi
+                               targetJson=$targetJson"\"$pid\""
+                       done
+               fi
+               targetJson=$targetJson"]"
+               echo " TARGET JSON: $targetJson" >> $HTTPLOG
+               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+               if [ $res -ne 0 ]; then
+                       echo -e $RED" FAIL, returned body not correct"$ERED
+                       ((RES_FAIL++))
+                       __check_stop_at_error
+                       return 1
+               fi
+       fi
+
        ((RES_PASS++))
        echo -e $GREEN" PASS"$EGREEN
        return 0
 }
 
 # API Test function: GET /ei-producer/v1/eiproducers/{eiProducerId}/status
-# args: <response-code>
+# args: <response-code> <producer-id> [<status>]
 # (Function for test scripts)
 ecs_api_edp_get_producer_status() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
     echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
        ((RES_TEST++))
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+    if [ $# -lt 2 ] || [ $# -gt 3 ]; then
+               __print_err "<response-code> <producer-id> [<status>]" $@
                return 1
        fi
 
+       query="/ei-producer/v1/eiproducers/$2/status"
+    res="$(__do_curl_to_api ECS GET $query)"
+    status=${res:${#res}-3}
+
+       if [ $status -ne $1 ]; then
+               echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
+               return 1
+       fi
+       if [ $# -eq 3 ]; then
+               body=${res:0:${#res}-3}
+               targetJson="{\"operational_state\": \"$3\"}"
+               echo " TARGET JSON: $targetJson" >> $HTTPLOG
+               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+               if [ $res -ne 0 ]; then
+                       echo -e $RED" FAIL, returned body not correct"$ERED
+                       ((RES_FAIL++))
+                       __check_stop_at_error
+                       return 1
+               fi
+       fi
+
        ((RES_PASS++))
        echo -e $GREEN" PASS"$EGREEN
        return 0
@@ -202,7 +462,7 @@ ecs_api_edp_get_producer_status() {
 
 
 # API Test function: GET /ei-producer/v1/eiproducers
-# args: <response-code> [<producer-id>]*|NOID
+# args: <response-code> [ EMPTY | <producer-id>+]
 # (Function for test scripts)
 ecs_api_edp_get_producer_ids() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
@@ -210,7 +470,7 @@ ecs_api_edp_get_producer_ids() {
        ((RES_TEST++))
 
     if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+               __print_err "<response-code> [ EMPTY | <producer-id>+]" $@
                return 1
        fi
 
@@ -233,13 +493,13 @@ ecs_api_edp_get_producer_ids() {
                        if [ "$targetJson" != "[" ]; then
                                targetJson=$targetJson","
                        fi
-                       if [ $pid != "NOID" ]; then
+                       if [ $pid != "EMPTY" ]; then
                                targetJson=$targetJson"\"$pid\""
                        fi
                done
 
                targetJson=$targetJson"]"
-               echo "TARGET JSON: $targetJson" >> $HTTPLOG
+               echo " TARGET JSON: $targetJson" >> $HTTPLOG
                res=$(python3 ../common/compare_json.py "$targetJson" "$body")
 
                if [ $res -ne 0 ]; then
@@ -256,129 +516,172 @@ ecs_api_edp_get_producer_ids() {
 }
 
 # API Test function: GET /ei-producer/v1/eitypes/{eiTypeId}
-# args: <response-code>
+# args: <response-code> <type-id> [<job-schema-file> (EMPTY | [<producer-id>]+)]
 # (Function for test scripts)
 ecs_api_edp_get_type() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
     echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
        ((RES_TEST++))
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+       paramError=1
+       if [ $# -eq 2 ]; then
+               paramError=0
+       fi
+       if [ $# -gt 3 ]; then
+               paramError=0
+       fi
+    if [ $paramError -ne 0 ]; then
+               __print_err "<response-code> <type-id> [<job-schema-file> 'EMPTY' | ([<producer-id>]+)]" $@
                return 1
        fi
 
-       ((RES_PASS++))
-       echo -e $GREEN" PASS"$EGREEN
-       return 0
-}
-
-# API Test function: GET /ei-producer/v1/eiproducers/{eiProducerId}
-# args: <response-code>
-# (Function for test scripts)
-ecs_api_edp_get_producer() {
-       echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
-    echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
-       ((RES_TEST++))
+       query="/ei-producer/v1/eitypes/$2"
+    res="$(__do_curl_to_api ECS GET $query)"
+    status=${res:${#res}-3}
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+       if [ $status -ne $1 ]; then
+               echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
+       if [ $# -gt 3 ]; then
+               body=${res:0:${#res}-3}
 
-       ((RES_PASS++))
-       echo -e $GREEN" PASS"$EGREEN
-       return 0
-}
+               if [ -f $3 ]; then
+                       schema=$(cat $3)
+               else
+                       echo -e $RED" FAIL. Job template file "$3", does not exist"$ERED
+                       ((RES_FAIL++))
+                       __check_stop_at_error
+                       return 1
+               fi
 
-# API Test function: DELETE /ei-producer/v1/eiproducers/{eiProducerId}
-# args: <response-code>
-# (Function for test scripts)
-ecs_api_edp_delete_producer() {
-       echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
-    echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
-       ((RES_TEST++))
+               targetJson=""
+               if [ $4 != "EMPTY" ]; then
+                       for pid in ${@:4} ; do
+                               if [ "$targetJson" != "" ]; then
+                                       targetJson=$targetJson","
+                               fi
+                               targetJson=$targetJson"\"$pid\""
+                       done
+               fi
+               targetJson="{\"ei_job_data_schema\":$schema, \"ei_producer_ids\": [$targetJson]}"
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
-               return 1
-       fi
+               echo " TARGET JSON: $targetJson" >> $HTTPLOG
+               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
 
+               if [ $res -ne 0 ]; then
+                       echo -e $RED" FAIL, returned body not correct"$ERED
+                       ((RES_FAIL++))
+                       __check_stop_at_error
+                       return 1
+               fi
+       fi
        ((RES_PASS++))
        echo -e $GREEN" PASS"$EGREEN
        return 0
 }
 
-# API Test function: PUT /ei-producer/v1/eiproducers/{eiProducerId}
-# args: <response-code>
+# API Test function: GET /ei-producer/v1/eiproducers/{eiProducerId}
+# args: <response-code> <producer-id> [<create-callback> <delete-callback> <supervision-callback> (EMPTY | [<type-id> <schema-file>]+) ]
 # (Function for test scripts)
-ecs_api_edp_put_producer() {
+ecs_api_edp_get_producer() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
     echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
        ((RES_TEST++))
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
-               return 1
+       #Possible arg count: 2, 6 7, 9, 11 etc
+       paramError=1
+       if [ $# -eq 2 ]; then
+               paramError=0
+       fi
+       if [ $# -eq 6 ] && [ "$6" == "EMPTY" ]; then
+               paramError=0
+       fi
+       variablecount=$(($#-5))
+       if [ $# -gt 5 ] && [ $(($variablecount%2)) -eq 0 ]; then
+               paramError=0
        fi
 
-       ((RES_PASS++))
-       echo -e $GREEN" PASS"$EGREEN
-       return 0
-}
+    if [ $paramError -ne 0 ]; then
+               __print_err "<response-code> <producer-id> [<create-callback> <delete-callback> <supervision-callback> (NOID | [<type-id> <schema-file>]+) ]" $@
+               return 1
+       fi
 
-# API Test function: GET /ei-producer/v1/eiproducers/{eiProducerId}/eijobs
-# args: <response-code>
-# (Function for test scripts)
-ecs_api_edp_get_producer_jobs() {
-       echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
-    echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
-       ((RES_TEST++))
+       query="/ei-producer/v1/eiproducers/$2"
+    res="$(__do_curl_to_api ECS GET $query)"
+    status=${res:${#res}-3}
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+       if [ $status -ne $1 ]; then
+               echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
 
+       if [ $# -gt 2 ]; then
+               body=${res:0:${#res}-3}
+               targetJson="["
+               if [ $# -gt 6 ]; then
+                       arr=(${@:6})
+                       for ((i=0; i<$(($#-6)); i=i+2)); do
+                               if [ "$targetJson" != "[" ]; then
+                                       targetJson=$targetJson","
+                               fi
+                               if [ -f ${arr[$i+1]} ]; then
+                                       schema=$(cat ${arr[$i+1]})
+                               else
+                                       echo -e $RED" FAIL. Schema file "${arr[$i+1]}", does not exist"$ERED
+                                       ((RES_FAIL++))
+                                       __check_stop_at_error
+                                       return 1
+                               fi
+
+                               targetJson=$targetJson"{\"ei_type_identity\":\"${arr[$i]}\",\"ei_job_data_schema\":$schema}"
+                       done
+               fi
+               targetJson=$targetJson"]"
+               if [ $# -gt 4 ]; then
+                       targetJson="{\"supported_ei_types\":$targetJson,\"ei_job_creation_callback_url\": \"$3\",\"ei_job_deletion_callback_url\": \"$4\",\"ei_producer_supervision_callback_url\": \"$5\"}"
+               fi
+               echo " TARGET JSON: $targetJson" >> $HTTPLOG
+               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+               if [ $res -ne 0 ]; then
+                       echo -e $RED" FAIL, returned body not correct"$ERED
+                       ((RES_FAIL++))
+                       __check_stop_at_error
+                       return 1
+               fi
+       fi
+
        ((RES_PASS++))
        echo -e $GREEN" PASS"$EGREEN
        return 0
 }
 
-
-##########################################
-####        Producer Simulator        ####
-##########################################
-# Function prefix: ecs_api_sim
-
-# API Test function: POST ​/producer_simulator​/job_deleted_error
-# args: <response-code>
+# API Test function: DELETE /ei-producer/v1/eiproducers/{eiProducerId}
+# args: <response-code> <producer-id>
 # (Function for test scripts)
-ecs_api_sim_post_job_delete_error() {
+ecs_api_edp_delete_producer() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
     echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
        ((RES_TEST++))
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+    if [ $# -lt 2 ]; then
+               __print_err "<response-code> <producer-id>" $@
                return 1
        fi
 
-       ((RES_PASS++))
-       echo -e $GREEN" PASS"$EGREEN
-       return 0
-}
-
-# API Test function: GET /producer_simulator​/supervision
-# args: <response-code>
-# (Function for test scripts)
-ecs_api_sim_get_producer_supervision() {
-       echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
-    echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
-       ((RES_TEST++))
+       query="/ei-producer/v1/eiproducers/$2"
+    res="$(__do_curl_to_api ECS DELETE $query)"
+    status=${res:${#res}-3}
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+       if [ $status -ne $1 ]; then
+               echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
 
@@ -387,34 +690,60 @@ ecs_api_sim_get_producer_supervision() {
        return 0
 }
 
-# API Test function: POST /producer_simulator​/job_deleted
-# args: <response-code>
+# API Test function: PUT /ei-producer/v1/eiproducers/{eiProducerId}
+# args: <response-code> <producer-id> <create-callback> <delete-callback> <supervision-callback> NOTYPE|[<type-id> <schema-file>]+
 # (Function for test scripts)
-ecs_api_sim_post_job_deleted() {
+ecs_api_edp_put_producer() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
     echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
        ((RES_TEST++))
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+       #Valid number of parametrer 6,7,9,11,
+       paramError=1
+       if  [ $# -eq 6 ] && [ "$6" == "NOTYPE" ]; then
+               paramError=0
+       elif [ $# -gt 6 ] && [ $(($#%2)) -eq 1 ]; then
+               paramError=0
+       fi
+       if [ $paramError -ne 0 ]; then
+               __print_err "<response-code> <producer-id> <create-callback> <delete-callback> <supervision-callback> [<type-id> <schema-file>]+" $@
                return 1
        fi
 
-       ((RES_PASS++))
-       echo -e $GREEN" PASS"$EGREEN
-       return 0
-}
+       inputJson="["
+       if [ $# -gt 6 ]; then
+               arr=(${@:6})
+               for ((i=0; i<$(($#-6)); i=i+2)); do
+                       if [ "$inputJson" != "[" ]; then
+                               inputJson=$inputJson","
+                       fi
+                       if [ -f ${arr[$i+1]} ]; then
+                               schema=$(cat ${arr[$i+1]})
+                       else
+                               echo -e $RED" FAIL. Schema file "${arr[$i+1]}", does not exist"$ERED
+                               ((RES_FAIL++))
+                               __check_stop_at_error
+                               return 1
+                       fi
+                       inputJson=$inputJson"{\"ei_type_identity\":\"${arr[$i]}\",\"ei_job_data_schema\":$schema}"
+               done
+       fi
+       inputJson="\"supported_ei_types\":"$inputJson"]"
 
-# API Test function: GET ​/producer_simulator​/supervision_error
-# args: <response-code>
-# (Function for test scripts)
-ecs_api_get_producer_supervision_error() {
-       echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
-    echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
-       ((RES_TEST++))
+       inputJson=$inputJson",\"ei_job_creation_callback_url\": \"$3\",\"ei_job_deletion_callback_url\": \"$4\",\"ei_producer_supervision_callback_url\": \"$5\""
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+       inputJson="{"$inputJson"}"
+
+       file="./tmp/.p.json"
+       echo "$inputJson" > $file
+       query="/ei-producer/v1/eiproducers/$2"
+    res="$(__do_curl_to_api ECS PUT $query $file)"
+    status=${res:${#res}-3}
+
+       if [ $status -ne $1 ]; then
+               echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
                return 1
        fi
 
@@ -423,35 +752,72 @@ ecs_api_get_producer_supervision_error() {
        return 0
 }
 
-# API Test function: POST /producer_simulator​/job_created_error
-# args: <response-code>
+# API Test function: GET /ei-producer/v1/eiproducers/{eiProducerId}/eijobs
+# args: <response-code> <producer-id> (EMPTY | [<job-id> <type-id> <target-url> <template-job-file>]+)
 # (Function for test scripts)
-ecs_api_sim_get_job_created_error() {
+ecs_api_edp_get_producer_jobs() {
        echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
     echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
        ((RES_TEST++))
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
+       #Valid number of parameter 2,3,6,10
+       paramError=1
+       if [ $# -eq 2 ]; then
+               paramError=0
+       fi
+       if [ $# -eq 3 ] && [ "$3" == "EMPTY" ]; then
+               paramError=0
+       fi
+       variablecount=$(($#-2))
+       if [ $# -gt 3 ] && [ $(($variablecount%4)) -eq 0 ]; then
+               paramError=0
+       fi
+       if [ $paramError -eq 1 ]; then
+               __print_err "<response-code> <producer-id> (EMPTY | [<job-id> <type-id> <target-url> <template-job-file>]+)" $@
                return 1
        fi
 
-       ((RES_PASS++))
-       echo -e $GREEN" PASS"$EGREEN
-       return 0
-}
+       query="/ei-producer/v1/eiproducers/$2/eijobs"
+    res="$(__do_curl_to_api ECS GET $query)"
+    status=${res:${#res}-3}
+       if [ $status -ne $1 ]; then
+               echo -e $RED" FAIL. Exepected status "$1", got "$status $ERED
+               ((RES_FAIL++))
+               __check_stop_at_error
+               return 1
+       fi
+       if [ $# -gt 2 ]; then
+               body=${res:0:${#res}-3}
+               targetJson="["
+               if [ $# -gt 3 ]; then
+                       arr=(${@:3})
+                       for ((i=0; i<$(($#-3)); i=i+4)); do
+                               if [ "$targetJson" != "[" ]; then
+                                       targetJson=$targetJson","
+                               fi
+                               if [ -f ${arr[$i+3]} ]; then
+                                       jobfile=$(cat ${arr[$i+3]})
+                                       jobfile=$(echo "$jobfile" | sed "s/XXXX/${arr[$i]}/g")
+                               else
+                                       echo -e $RED" FAIL. Job template file "${arr[$i+3]}", does not exist"$ERED
+                                       ((RES_FAIL++))
+                                       __check_stop_at_error
+                                       return 1
+                               fi
+                               targetJson=$targetJson"{\"ei_job_identity\":\"${arr[$i]}\",\"ei_type_identity\":\"${arr[$i+1]}\",\"target_uri\":\"${arr[$i+2]}\",\"ei_job_data\":$jobfile}"
+                       done
+               fi
+               targetJson=$targetJson"]"
 
-# API Test function: POST ​/producer_simulator​/job_created
-# args: <response-code>
-# (Function for test scripts)
-ecs_api_sim_get_job_created() {
-       echo -e $BOLD"TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ $EBOLD
-    echo "TEST(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
-       ((RES_TEST++))
+               echo " TARGET JSON: $targetJson" >> $HTTPLOG
+               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
 
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<producer-id>]*|NOID" $@
-               return 1
+               if [ $res -ne 0 ]; then
+                       echo -e $RED" FAIL, returned body not correct"$ERED
+                       ((RES_FAIL++))
+                       __check_stop_at_error
+                       return 1
+               fi
        fi
 
        ((RES_PASS++))