Updated tests for changed ECS NBI
Issue-ID: NONRTRIC-513
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: Ia39d650a8f549be200cfcd3dff4bec58d74cb2ca
diff --git a/test/common/README.md b/test/common/README.md
index bdb2f0d..65f20cc 100644
--- a/test/common/README.md
+++ b/test/common/README.md
@@ -1165,7 +1165,7 @@
| `<template-job-file>` | Path to a job template for job parameters of the job |
## Function: ecs_api_edp_get_type_ids() ##
-Test of GET '/ei-producer/v1/eitypes' and an optional check of the returned list of type ids.
+Test of GET '/ei-producer/v1/eitypes' or '/data-producer/v1/info-types' depending on ecs version and an optional check of the returned list of type ids.
To test the response code only, provide the response code.
To also test the response payload add list of expected type ids (or EMPTY if the list is expected to be empty).
@@ -1176,11 +1176,11 @@
| parameter | description |
| --------- | ----------- |
| `<response-code>` | Expected http response code |
-| `<type-id>` | Id of the EI type |
+| `<type-id>` | Id of the type |
| `EMPTY` | The expected list of type ids shall be empty |
## Function: ecs_api_edp_get_producer_status() ##
-Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}/status' and optional check of the returned status.
+Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}/status' or '/data-producer/v1/info-producers/{infoProducerId}/status' depending on ecs version and optional check of the returned status.
To test the response code only, provide the response code and producer id.
To also test the response payload add the expected status.
@@ -1209,6 +1209,23 @@
| `<producer-id>` | Id of the producer |
| `EMPTY` | The expected list of type ids shall be empty |
+## Function: ecs_api_edp_get_producer_ids_2() ##
+Test of GET '/ei-producer/v1/eiproducers' or '/data-producer/v1/info-producers' depending on ecs version and optional check of the returned producer ids.
+To test the response code only, provide the response.
+To also test the response payload add the type (if any) and a list of expected producer-ids (or EMPTY if the list of ids is expected to be empty).
+
+| arg list |
+|--|
+| `<response-code> [ ( NOTYPE | <type-id> ) [ EMPTY | <producer-id>+]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<type-id>` | Id of the type |
+| `EMPTY` | No type given |
+| `<producer-id>` | Id of the producer |
+| `EMPTY` | The expected list of type ids shall be empty |
+
## Function: ecs_api_edp_get_type() ##
Test of GET '/ei-producer/v1/eitypes/{eiTypeId}' and optional check of the returned type.
To test the response code only, provide the response and the type-id.
@@ -1221,11 +1238,53 @@
| parameter | description |
| --------- | ----------- |
| `<response-code>` | Expected http response code |
-| `<type-id>` | Id of the EI type |
+| `<type-id>` | Id of the type |
| `<job-schema-file>` | Path to a job schema file |
| `<producer-id>` | Id of the producer |
| `EMPTY` | The expected list of type ids shall be empty |
+## Function: ecs_api_edp_get_type_2() ##
+Test of GET '/ei-producer/v1/eitypes/{eiTypeId}' or '/data-producer/v1/info-types/{infoTypeId}' depending on ecs version and optional check of the returned type.
+To test the response code only, provide the response and the type-id.
+To also test the response payload add a path to a job schema file.
+
+| arg list |
+|--|
+| `<response-code> <type-id> [<job-schema-file>]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<type-id>` | Id of the type |
+| `<job-schema-file>` | Path to a job schema file |
+| `EMPTY` | The expected list of type ids shall be empty |
+
+## Function: ecs_api_edp_put_type_2() ##
+Test of PUT '/ei-producer/v1/eitypes/{eiTypeId}' or '/data-producer/v1/info-types/{infoTypeId}' depending on ecs version and optional check of the returned type.
+
+| arg list |
+|--|
+| `<response-code> <type-id> [<job-schema-file>]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<type-id>` | Id of the type |
+| `<job-schema-file>` | Path to a job schema file |
+| `EMPTY` | The expected list of type ids shall be empty |
+
+## Function: ecs_api_edp_delete_type_2() ##
+Test of DELETE '/ei-producer/v1/eitypes/{eiTypeId}' or '/data-producer/v1/info-types/{infoTypeId}' depending on ecs version and optional check of the returned type.
+
+| arg list |
+|--|
+| `<response-code> <type-id>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<type-id>` | Id of the type |
+
## Function: ecs_api_edp_get_producer() ##
Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}' and optional check of the returned producer.
To test the response code only, provide the response and the producer-id.
@@ -1242,12 +1301,31 @@
| `<create-callback>` | Callback for create job |
| `<delete-callback>` | Callback for delete job |
| `<supervision-callback>` | Callback for producer supervision |
-| `<type-id>` | Id of the EI type |
+| `<type-id>` | Id of the type |
| `<schema-file>` | Path to a schema file |
| `EMPTY` | The expected list of type schema pairs shall be empty |
+
+## Function: ecs_api_edp_get_producer_2() ##
+Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}' or '/data-producer/v1/info-producers/{infoProducerId}' depending on ecs version and optional check of the returned producer.
+To test the response code only, provide the response and the producer-id.
+To also test the response payload add the remaining parameters defining thee producer.
+
+| arg list |
+|--|
+| `<response-code> <producer-id> [<job-callback> <supervision-callback> (EMPTY | <type-id>+) ]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<producer-id>` | Id of the producer |
+| `<job-callback>` | Callback for the url |
+| `<supervision-callback>` | Callback for producer supervision |
+| `<type-id>` | Id of the type |
+| `EMPTY` | The expected list of types shall be empty |
+
## Function: ecs_api_edp_delete_producer() ##
-Test of DELETE '/ei-producer/v1/eiproducers/{eiProducerId}'.
+Test of DELETE '/ei-producer/v1/eiproducers/{eiProducerId}' or '/data-producer/v1/info-producers/{infoProducerId}' depending on ecs version.
To test, provide all parameters.
| arg list |
@@ -1273,10 +1351,27 @@
| `<producer-id>` | Id of the producer |
| `<job-callback>` | Callback for create/delete job |
| `<supervision-callback>` | Callback for producer supervision |
-| `<type-id>` | Id of the EI type |
+| `<type-id>` | Id of the type |
| `<schema-file>` | Path to a schema file |
| `EMPTY` | The list of type/schema pairs is empty |
+## Function: ecs_api_edp_put_producer_2() ##
+Test of PUT '/ei-producer/v1/eiproducers/{eiProducerId}' or '/data-producer/v1/info-producers/{infoProducerId}' depending on ecs version.
+To test, provide all parameters. The list of type/schema pair may be empty.
+
+| arg list |
+|--|
+| `<response-code> <producer-id> <job-callback> <supervision-callback> NOTYPE|[<type-id>+]` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<producer-id>` | Id of the producer |
+| `<job-callback>` | Callback for create/delete job |
+| `<supervision-callback>` | Callback for producer supervision |
+| `<type-id>` | Id of the type |
+| `NOTYPE` | The list of types is empty |
+
## Function: ecs_api_edp_get_producer_jobs() ##
Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}/eijobs' and optional check of the returned producer job.
To test the response code only, provide the response and the producer-id.
@@ -1297,6 +1392,26 @@
| `<template-job-file>` | Path to a job template file |
| `EMPTY` | The list of job/type/target/job-file tuples is empty |
+## Function: ecs_api_edp_get_producer_jobs_2() ##
+Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}/eijobs' or '/data-producer/v1/info-producers/{infoProducerId}/info-jobs' depending on ecs version and optional check of the returned producer job.
+To test the response code only, provide the response and the producer-id.
+To also test the response payload add the remaining parameters.
+
+| arg list |
+|--|
+| `<response-code> <producer-id> (EMPTY | [<job-id> <type-id> <target-url> <job-owner> <template-job-file>]+)` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<producer-id>` | Id of the producer |
+| `<job-id>` | Id of the job |
+| `<type-id>` | Id of the type |
+| `<target-url>` | Target url for data delivery |
+| `<job-owner>` | Id of the job owner |
+| `<template-job-file>` | Path to a job template file |
+| `EMPTY` | The list of job/type/target/job-file tuples is empty |
+
## Function: ecs_api_service_status() ##
Test of GET '/status'.
@@ -1388,7 +1503,7 @@
| parameter | description |
| --------- | ----------- |
| `<response-code>` | Expected http response code |
-| `<type-id>` | Id of the EI type |
+| `<type-id>` | Id of the type |
| `<job-id>` | Id of the job |
## Function: ecs_api_idc_get_type() ##
@@ -1479,7 +1594,7 @@
| `<response-code>` | Expected http response code |
## Function: gateway_ecs_get_types ##
-Sample test of ecs api (get ei type)
+Sample test of ecs api (get types)
Only response code tested - not payload
| arg list |
|--|
@@ -1706,6 +1821,40 @@
| `<job-owner>` | Id of the job owner |
| `<template-job-file>` | Path to a job template file |
+## Function: prodstub_check_jobdata_2() ##
+Check a job in the prodstub towards the list of provided parameters.
+
+| arg list |
+|--|
+| `<response-code> <producer-id> <job-id> <type-id> <target-url> <job-owner> <template-job-file>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<producer-id>` | Id of the producer |
+| `<job-id>` | Id of the job |
+| `<type-id>` | Id of the type |
+| `<target-url>` | Target url for data delivery |
+| `<job-owner>` | Id of the job owner |
+| `<template-job-file>` | Path to a job template file |
+
+## Function: prodstub_check_jobdata_3() ##
+Check a job in the prodstub towards the list of provided parameters.
+
+| arg list |
+|--|
+| `<response-code> <producer-id> <job-id> <type-id> <target-url> <job-owner> <template-job-file>` |
+
+| parameter | description |
+| --------- | ----------- |
+| `<response-code>` | Expected http response code |
+| `<producer-id>` | Id of the producer |
+| `<job-id>` | Id of the job |
+| `<type-id>` | Id of the type |
+| `<target-url>` | Target url for data delivery |
+| `<job-owner>` | Id of the job owner |
+| `<template-job-file>` | Path to a job template file |
+
## Function: prodstub_delete_jobdata() ##
Delete the job parameters, job data, for a job.
diff --git a/test/common/ecs_api_functions.sh b/test/common/ecs_api_functions.sh
index 56167b6..3edb88d 100644
--- a/test/common/ecs_api_functions.sh
+++ b/test/common/ecs_api_functions.sh
@@ -943,6 +943,7 @@
# Function prefix: ecs_api_edp
# API Test function: GET /ei-producer/v1/eitypes
+# API Test function: GET /data-producer/v1/info-types
# args: <response-code> [ EMPTY | <type-id>+]
# (Function for test scripts)
ecs_api_edp_get_type_ids() {
@@ -952,8 +953,11 @@
__print_err "<response-code> [ EMPTY | <type-id>+]" $@
return 1
fi
-
- query="/ei-producer/v1/eitypes"
+ if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ query="/data-producer/v1/info-types"
+ else
+ query="/ei-producer/v1/eitypes"
+ fi
res="$(__do_curl_to_api ECS GET $query)"
status=${res:${#res}-3}
@@ -988,6 +992,7 @@
}
# API Test function: GET /ei-producer/v1/eiproducers/{eiProducerId}/status
+# API Test function: GET /data-producer/v1/info-producers/{infoProducerId}/status
# args: <response-code> <producer-id> [<status> [<timeout>]]
# (Function for test scripts)
ecs_api_edp_get_producer_status() {
@@ -997,8 +1002,11 @@
__print_err "<response-code> <producer-id> [<status> [<timeout>]]" $@
return 1
fi
-
- query="/ei-producer/v1/eiproducers/$2/status"
+ if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ query="/data-producer/v1/info-producers/$2/status"
+ else
+ query="/ei-producer/v1/eiproducers/$2/status"
+ fi
start=$SECONDS
for (( ; ; )); do
res="$(__do_curl_to_api ECS GET $query)"
@@ -1097,6 +1105,7 @@
}
# API Test function: GET /ei-producer/v1/eiproducers
+# API Test function: GET /data-producer/v1/info-producers
# args (v1_2): <response-code> [ ( NOTYPE | <type-id> ) [ EMPTY | <producer-id>+] ]
# (Function for test scripts)
ecs_api_edp_get_producer_ids_2() {
@@ -1106,10 +1115,16 @@
__print_err "<response-code> [ ( NOTYPE | <type-id> ) [ EMPTY | <producer-id>+] ]" $@
return 1
fi
-
- query="/ei-producer/v1/eiproducers"
- if [ $# -gt 1 ] && [ $2 != "NOTYPE" ]; then
- query=$query"?ei_type_id=$2"
+ if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ query="/data-producer/v1/info-producers"
+ if [ $# -gt 1 ] && [ $2 != "NOTYPE" ]; then
+ query=$query"?info_type_id=$2"
+ fi
+ else
+ query="/ei-producer/v1/eiproducers"
+ if [ $# -gt 1 ] && [ $2 != "NOTYPE" ]; then
+ query=$query"?ei_type_id=$2"
+ fi
fi
res="$(__do_curl_to_api ECS GET $query)"
status=${res:${#res}-3}
@@ -1206,6 +1221,7 @@
}
# API Test function: GET /ei-producer/v1/eitypes/{eiTypeId}
+# API Test function: GET /data-producer/v1/info-types/{infoTypeId}
# args: (v1_2) <response-code> <type-id> [<job-schema-file> ]
# (Function for test scripts)
ecs_api_edp_get_type_2() {
@@ -1222,8 +1238,12 @@
__print_err "<response-code> <type-id> [<job-schema-file> ]" $@
return 1
fi
+ if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ query="/data-producer/v1/info-types/$2"
+ else
+ query="/ei-producer/v1/eitypes/$2"
+ fi
- query="/ei-producer/v1/eitypes/$2"
res="$(__do_curl_to_api ECS GET $query)"
status=${res:${#res}-3}
@@ -1240,8 +1260,11 @@
__log_test_fail_general "Job template file "$3", does not exist"
return 1
fi
-
- targetJson="{\"ei_job_data_schema\":$schema}"
+ if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ targetJson="{\"info_job_data_schema\":$schema}"
+ else
+ targetJson="{\"ei_job_data_schema\":$schema}"
+ fi
echo " TARGET JSON: $targetJson" >> $HTTPLOG
res=$(python3 ../common/compare_json.py "$targetJson" "$body")
@@ -1256,6 +1279,7 @@
}
# API Test function: PUT /ei-producer/v1/eitypes/{eiTypeId}
+# API Test function: PUT /data-producer/v1/info-types/{infoTypeId}
# args: (v1_2) <response-code> <type-id> <job-schema-file>
# (Function for test scripts)
ecs_api_edp_put_type_2() {
@@ -1270,12 +1294,21 @@
__log_test_fail_general "Job schema file "$3", does not exist"
return 1
fi
- schema=$(cat $3)
- input_json="{\"ei_job_data_schema\":$schema}"
- file="./tmp/put_type.json"
- echo $input_json > $file
+ if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ schema=$(cat $3)
+ input_json="{\"info_job_data_schema\":$schema}"
+ file="./tmp/put_type.json"
+ echo $input_json > $file
- query="/ei-producer/v1/eitypes/$2"
+ query="/data-producer/v1/info-types/$2"
+ else
+ schema=$(cat $3)
+ input_json="{\"ei_job_data_schema\":$schema}"
+ file="./tmp/put_type.json"
+ echo $input_json > $file
+
+ query="/ei-producer/v1/eitypes/$2"
+ fi
res="$(__do_curl_to_api ECS PUT $query $file)"
status=${res:${#res}-3}
@@ -1289,6 +1322,7 @@
}
# API Test function: DELETE /ei-producer/v1/eitypes/{eiTypeId}
+# API Test function: DELETE /data-producer/v1/info-types/{infoTypeId}
# args: (v1_2) <response-code> <type-id>
# (Function for test scripts)
ecs_api_edp_delete_type_2() {
@@ -1299,7 +1333,11 @@
return 1
fi
- query="/ei-producer/v1/eitypes/$2"
+ if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ query="/data-producer/v1/info-types/$2"
+ else
+ query="/ei-producer/v1/eitypes/$2"
+ fi
res="$(__do_curl_to_api ECS DELETE $query)"
status=${res:${#res}-3}
@@ -1382,6 +1420,7 @@
}
# API Test function: GET /ei-producer/v1/eiproducers/{eiProducerId}
+# API Test function: GET /data-producer/v1/info-producers/{infoProducerId}
# args (v1_2): <response-code> <producer-id> [<job-callback> <supervision-callback> (EMPTY | <type-id>+) ]
# (Function for test scripts)
ecs_api_edp_get_producer_2() {
@@ -1403,8 +1442,11 @@
__print_err "<response-code> <producer-id> [<job-callback> <supervision-callback> (EMPTY | <type-id>+) ]" $@
return 1
fi
-
- query="/ei-producer/v1/eiproducers/$2"
+ if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ query="/data-producer/v1/info-producers/$2"
+ else
+ query="/ei-producer/v1/eiproducers/$2"
+ fi
res="$(__do_curl_to_api ECS GET $query)"
status=${res:${#res}-3}
@@ -1427,7 +1469,11 @@
fi
targetJson=$targetJson"]"
if [ $# -gt 4 ]; then
- targetJson="{\"supported_ei_types\":$targetJson,\"ei_job_callback_url\": \"$3\",\"ei_producer_supervision_callback_url\": \"$4\"}"
+ if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ targetJson="{\"supported_info_types\":$targetJson,\"info_job_callback_url\": \"$3\",\"info_producer_supervision_callback_url\": \"$4\"}"
+ else
+ targetJson="{\"supported_ei_types\":$targetJson,\"ei_job_callback_url\": \"$3\",\"ei_producer_supervision_callback_url\": \"$4\"}"
+ fi
fi
echo " TARGET JSON: $targetJson" >> $HTTPLOG
res=$(python3 ../common/compare_json.py "$targetJson" "$body")
@@ -1443,6 +1489,7 @@
}
# API Test function: DELETE /ei-producer/v1/eiproducers/{eiProducerId}
+# API Test function: DELETE /data-producer/v1/info-producers/{infoProducerId}
# args: <response-code> <producer-id>
# (Function for test scripts)
ecs_api_edp_delete_producer() {
@@ -1452,8 +1499,11 @@
__print_err "<response-code> <producer-id>" $@
return 1
fi
-
- query="/ei-producer/v1/eiproducers/$2"
+ if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ query="/data-producer/v1/info-producers/$2"
+ else
+ query="/ei-producer/v1/eiproducers/$2"
+ fi
res="$(__do_curl_to_api ECS DELETE $query)"
status=${res:${#res}-3}
@@ -1522,6 +1572,7 @@
}
# API Test function: PUT /ei-producer/v1/eiproducers/{eiProducerId}
+# API Test function: PUT /data-producer/v1/info-producers/{infoProducerId}
# args: (v1_2) <response-code> <producer-id> <job-callback> <supervision-callback> NOTYPE|[<type-id>+]
# (Function for test scripts)
ecs_api_edp_put_producer_2() {
@@ -1549,15 +1600,27 @@
inputJson=$inputJson"\""${arr[$i]}"\""
done
fi
- inputJson="\"supported_ei_types\":"$inputJson"]"
+ if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ inputJson="\"supported_info_types\":"$inputJson"]"
- inputJson=$inputJson",\"ei_job_callback_url\": \"$3\",\"ei_producer_supervision_callback_url\": \"$4\""
+ inputJson=$inputJson",\"info_job_callback_url\": \"$3\",\"info_producer_supervision_callback_url\": \"$4\""
- inputJson="{"$inputJson"}"
+ inputJson="{"$inputJson"}"
- file="./tmp/.p.json"
- echo "$inputJson" > $file
- query="/ei-producer/v1/eiproducers/$2"
+ file="./tmp/.p.json"
+ echo "$inputJson" > $file
+ query="/data-producer/v1/info-producers/$2"
+ else
+ inputJson="\"supported_ei_types\":"$inputJson"]"
+
+ inputJson=$inputJson",\"ei_job_callback_url\": \"$3\",\"ei_producer_supervision_callback_url\": \"$4\""
+
+ inputJson="{"$inputJson"}"
+
+ file="./tmp/.p.json"
+ echo "$inputJson" > $file
+ query="/ei-producer/v1/eiproducers/$2"
+ fi
res="$(__do_curl_to_api ECS PUT $query $file)"
status=${res:${#res}-3}
@@ -1635,6 +1698,7 @@
}
# API Test function: GET /ei-producer/v1/eiproducers/{eiProducerId}/eijobs
+# API Test function: GET /data-producer/v1/info-producers/{infoProducerId}/info-jobs
# args: (V1-2) <response-code> <producer-id> (EMPTY | [<job-id> <type-id> <target-url> <job-owner> <template-job-file>]+)
# (Function for test scripts)
ecs_api_edp_get_producer_jobs_2() {
@@ -1656,8 +1720,11 @@
__print_err "<response-code> <producer-id> (EMPTY | [<job-id> <type-id> <target-url> <job-owner> <template-job-file>]+)" $@
return 1
fi
-
- query="/ei-producer/v1/eiproducers/$2/eijobs"
+ if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ query="/data-producer/v1/info-producers/$2/info-jobs"
+ else
+ query="/ei-producer/v1/eiproducers/$2/eijobs"
+ fi
res="$(__do_curl_to_api ECS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1680,7 +1747,11 @@
__log_test_fail_general "Job template file "${arr[$i+4]}", does not exist"
return 1
fi
- targetJson=$targetJson"{\"ei_job_identity\":\"${arr[$i]}\",\"ei_type_identity\":\"${arr[$i+1]}\",\"target_uri\":\"${arr[$i+2]}\",\"owner\":\"${arr[$i+3]}\",\"ei_job_data\":$jobfile, \"last_updated\":\"????\"}"
+ if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ targetJson=$targetJson"{\"info_job_identity\":\"${arr[$i]}\",\"info_type_identity\":\"${arr[$i+1]}\",\"target_uri\":\"${arr[$i+2]}\",\"owner\":\"${arr[$i+3]}\",\"info_job_data\":$jobfile, \"last_updated\":\"????\"}"
+ else
+ targetJson=$targetJson"{\"ei_job_identity\":\"${arr[$i]}\",\"ei_type_identity\":\"${arr[$i+1]}\",\"target_uri\":\"${arr[$i+2]}\",\"owner\":\"${arr[$i+3]}\",\"ei_job_data\":$jobfile, \"last_updated\":\"????\"}"
+ fi
done
fi
targetJson=$targetJson"]"
@@ -1862,7 +1933,7 @@
__log_test_fail_general "Job template file "$6", does not exist"
return 1
fi
- targetJson="{\"infoTypeId\": \"$3\", \"jobResultUri\": \"$4\",\"jobOwner\": \"$5\",\"jobStatusNotificationUri\": \"$6\",\"jobDefinition\": $jobfile}"
+ targetJson="{\"info_type_id\": \"$3\", \"job_result_uri\": \"$4\",\"job_owner\": \"$5\",\"status_notification_uri\": \"$6\",\"job_definition\": $jobfile}"
echo " TARGET JSON: $targetJson" >> $HTTPLOG
res=$(python3 ../common/compare_json.py "$targetJson" "$body")
@@ -1895,7 +1966,7 @@
return 1
fi
- inputJson="{\"infoTypeId\": \"$3\", \"jobResultUri\": \"$4\",\"jobOwner\": \"$5\",\"jobStatusNotificationUri\": \"$6\",\"jobDefinition\": $jobfile}"
+ inputJson="{\"info_type_id\": \"$3\", \"job_result_uri\": \"$4\",\"job_owner\": \"$5\",\"status_notification_uri\": \"$6\",\"job_definition\": $jobfile}"
file="./tmp/.p.json"
echo "$inputJson" > $file
@@ -1970,7 +2041,7 @@
__log_test_fail_general "Schema file "$3", does not exist"
return 1
fi
- targetJson="{\"consumer_job_data_schema\":$schema}"
+ targetJson="{\"job_data_schema\":$schema}"
echo " TARGET JSON: $targetJson" >> $HTTPLOG
res=$(python3 ../common/compare_json.py "$targetJson" "$body")
@@ -2021,7 +2092,7 @@
fi
if [ $# -ge 3 ] && [ $status -eq $1 ]; then
body=${res:0:${#res}-3}
- targetJson="{\"eiJobStatus\": \"$3\"}"
+ targetJson="{\"info_job_status\": \"$3\"}"
echo " TARGET JSON: $targetJson" >> $HTTPLOG
res=$(python3 ../common/compare_json.py "$targetJson" "$body")
diff --git a/test/common/prodstub_api_functions.sh b/test/common/prodstub_api_functions.sh
index 6b7a3d8..54e59e3 100644
--- a/test/common/prodstub_api_functions.sh
+++ b/test/common/prodstub_api_functions.sh
@@ -457,6 +457,32 @@
return $?
}
+# Prodstub API: Get job data for a job and compare with a target job json (info-jobs)
+# <response-code> <producer-id> <job-id> <type-id> <target-url> <job-owner> <template-job-file>
+# (Function for test scripts)
+prodstub_check_jobdata_3() {
+ __log_test_start $@
+ if [ $# -ne 7 ]; then
+ __print_err "<response-code> <producer-id> <job-id> <type-id> <target-url> <job-owner> <template-job-file>" $@
+ return 1
+ fi
+ if [ -f $7 ]; then
+ jobfile=$(cat $7)
+ jobfile=$(echo "$jobfile" | sed "s/XXXX/$3/g")
+ else
+ __log_test_fail_general "Template file "$7" for jobdata, does not exist"
+ return 1
+ fi
+ targetJson="{\"info_job_identity\":\"$3\",\"info_type_identity\":\"$4\",\"target_uri\":\"$5\",\"owner\":\"$6\", \"info_job_data\":$jobfile,\"last_updated\":\"????\"}"
+ file="./tmp/.p.json"
+ echo "$targetJson" > $file
+
+ curlString="curl -X GET -skw %{http_code} $PROD_STUB_PATH/jobdata/$2/$3"
+
+ __execute_curl_to_prodstub TEST $1 "$curlString" $file
+ return $?
+}
+
# Prodstub API: Delete the job data
# <response-code> <producer-id> <job-id>
# (Function for test scripts)