Change of ECS to ICS in test env
Issue-ID: NONRTRIC-640
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
Change-Id: Idcb4cc288b2e057120b5d8568070e852e6cd4487
diff --git a/test/common/README.md b/test/common/README.md
index 11e2a97..c52ee9c 100644
--- a/test/common/README.md
+++ b/test/common/README.md
@@ -9,7 +9,7 @@
Contains functions for adapting towards the Policy Management Service (PMS) API, also via dmaap (using a message-router stub interface)
`api_curl.sh` \
-A common curl based function for the agent and ecs apis. Also partly used for the Callback receiver and RAPP Catalogue apis.
+A common curl based function for the agent and ics apis. Also partly used for the Callback receiver and RAPP Catalogue apis.
`clean-kube.sh` \
Cleans all services, deployments, pods, replica set etc started by the test environment in kubernetes.
@@ -44,8 +44,8 @@
`do_curl_function.sh`
A script for executing a curl call with a specific url and optional payload. It also compare the response with an expected result in terms of response code and optional returned payload. Intended to be used by test script (for example basic test scripts of other components)
-`ecs_api_functions.sh` \
-Contains functions for adapting towards the ECS API
+`ics_api_functions.sh` \
+Contains functions for adapting towards the ICS API
`extract_sdnc_reply.py` \
A python script to extract the information from an sdnc (A1 Controller) reply json. Helper for the test environment.
@@ -1030,9 +1030,9 @@
| `EMPTY` | Indicator for an empty list |
| `<ric-id>` | Id of the ric |
-## Function: cr_api_check_all_ecs_events() ##
+## Function: cr_api_check_all_ics_events() ##
-Check the contents of all current status events for one id from ECS
+Check the contents of all current status events for one id from ICS
| arg list |
|--|
@@ -1045,9 +1045,9 @@
| `EMPTY` | Indicator for an empty list |
| `<status>` | Status string |
-## Function: cr_api_check_all_ecs_subscription_events() ##
+## Function: cr_api_check_all_ics_subscription_events() ##
-Check the contents of all current subscription events for one id from ECS
+Check the contents of all current subscription events for one id from ICS
| arg list |
|--|
@@ -1072,81 +1072,81 @@
| - |
-# Description of functions in ecs_api_functions.sh #
+# Description of functions in ics_api_functions.sh #
-## Function: use_ecs_rest_http ##
+## Function: use_ics_rest_http ##
-Use http for all API calls to the ECS. This is the default protocol.
+Use http for all API calls to the ICS. This is the default protocol.
| arg list |
|--|
| None |
-## Function: use_ecs_rest_https ##
+## Function: use_ics_rest_https ##
-Use https for all API calls to the ECS.
+Use https for all API calls to the ICS.
| arg list |
|--|
| None |
-## Function: use_ecs_dmaap_http ##
+## Function: use_ics_dmaap_http ##
-Send and recieve all API calls to the ECS over Dmaap via the MR using http.
+Send and recieve all API calls to the ICS over Dmaap via the MR using http.
| arg list |
|--|
| None |
-## Function: use_ecs_dmaap_https ##
+## Function: use_ics_dmaap_https ##
-Send and recieve all API calls to the ECS over Dmaap via the MR using https.
+Send and recieve all API calls to the ICS over Dmaap via the MR using https.
| arg list |
|--|
| None |
-## Function: start_ecs ##
+## Function: start_ics ##
-Start the ECS container in docker or kube depending on running mode.
+Start the ICS container in docker or kube depending on running mode.
| arg list |
|--|
| None |
-## Function: stop_ecs ##
+## Function: stop_ics ##
-Stop the ECS container.
+Stop the ICS container.
| arg list |
|--|
| None |
-## Function: start_stopped_ecs ##
+## Function: start_stopped_ics ##
-Start a previously stopped ecs.
+Start a previously stopped ics.
| arg list |
|--|
| None |
-## Function: set_ecs_debug ##
+## Function: set_ics_debug ##
-Configure the ECS log on debug level. The ECS must be running.
+Configure the ICS log on debug level. The ICS must be running.
| arg list |
|--|
| None |
-## Function: set_ecs_trace ##
+## Function: set_ics_trace ##
-Configure the ECS log on trace level. The ECS must be running.
+Configure the ICS log on trace level. The ICS must be running.
| arg list |
|--|
| None |
-## Function: check_ecs_logs ##
+## Function: check_ics_logs ##
-Check the ECS log for any warnings and errors and print the count of each.
+Check the ICS log for any warnings and errors and print the count of each.
| arg list |
|--|
| None |
-## Function: ecs_equal ##
+## Function: ics_equal ##
-Tests if a variable value in the ECS is equal to a target value.
+Tests if a variable value in the ICS is equal to a target value.
Without the timeout, the test sets pass or fail immediately depending on if the variable is equal to the target or not.
With the timeout, the test waits up to the timeout seconds before setting pass or fail depending on if the variable value becomes equal to the target value or not.
See the 'a1-interface' repo for more details.
@@ -1157,11 +1157,11 @@
| parameter | description |
| --------- | ----------- |
-| `<variable-name>` | Variable name in ecs |
+| `<variable-name>` | Variable name in ics |
| `<target-value>` | Target value for the variable |
| `<timeout-in-sec>` | Max time to wait for the variable to reach the target value |
-## Function: ecs_api_a1_get_job_ids() ##
+## Function: ics_api_a1_get_job_ids() ##
Test of GET '/A1-EI/v1/eitypes/{eiTypeId}/eijobs' and optional check of the array of returned job ids.
To test the response code only, provide the response code parameter as well as a type id and an owner id.
@@ -1180,7 +1180,7 @@
| `<job-id>` | Id of the expected job |
| `EMPTY` | The expected list of job id shall be empty |
-## Function: ecs_api_a1_get_type() ##
+## Function: ics_api_a1_get_type() ##
Test of GET '/A1-EI/v1/eitypes/{eiTypeId}' and optional check of the returned schema.
To test the response code only, provide the response code parameter as well as the type-id.
@@ -1196,7 +1196,7 @@
| `<type-id>` | Id of the EI type |
| `<schema-file>` | Path to a schema file to compare with the returned schema |
-## Function: ecs_api_a1_get_type_ids() ##
+## Function: ics_api_a1_get_type_ids() ##
Test of GET '/A1-EI/v1/eitypes' and optional check of returned list of type ids.
To test the response code only, provide the response only.
@@ -1212,7 +1212,7 @@
| `EMPTY` | The expected list of type ids shall be empty |
| `<type-id>` | Id of the EI type |
-## Function: ecs_api_a1_get_job_status() ##
+## Function: ics_api_a1_get_job_status() ##
Test of GET '/A1-EI/v1/eitypes/{eiTypeId}/eijobs/{eiJobId}/status' and optional check of the returned status.
To test the response code only, provide the response code, type id and job id.
@@ -1229,7 +1229,7 @@
| `<job-id>` | Id of the job |
| `<status>` | Expected status |
-## Function: ecs_api_a1_get_job() ##
+## Function: ics_api_a1_get_job() ##
Test of GET '/A1-EI/v1/eitypes/{eiTypeId}/eijobs/{eiJobId}' and optional check of the returned job.
To test the response code only, provide the response code, type id and job id.
@@ -1248,7 +1248,7 @@
| `<owner-id>` | Expected owner for the job |
| `<template-job-file>` | Path to a job template for job parameters of the job |
-## Function: ecs_api_a1_delete_job() ##
+## Function: ics_api_a1_delete_job() ##
Test of DELETE '/A1-EI/v1/eitypes/{eiTypeId}/eijobs/{eiJobId}'.
To test, provide all the specified parameters.
@@ -1263,7 +1263,7 @@
| `<type-id>` | Id of the EI type |
| `<job-id>` | Id of the job |
-## Function: ecs_api_a1_put_job() ##
+## Function: ics_api_a1_put_job() ##
Test of PUT '/A1-EI/v1/eitypes/{eiTypeId}/eijobs/{eiJobId}'.
To test, provide all the specified parameters.
@@ -1281,9 +1281,9 @@
| `<owner-id>` | Owner of the job |
| `<template-job-file>` | Path to a job template for job parameters of the job |
-## Function: ecs_api_edp_get_type_ids() ##
+## Function: ics_api_edp_get_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.
+Test of GET '/ei-producer/v1/eitypes' or '/data-producer/v1/info-types' depending on ics 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).
@@ -1297,9 +1297,9 @@
| `<type-id>` | Id of the type |
| `EMPTY` | The expected list of type ids shall be empty |
-## Function: ecs_api_edp_get_producer_status() ##
+## Function: ics_api_edp_get_producer_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.
+Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}/status' or '/data-producer/v1/info-producers/{infoProducerId}/status' depending on ics 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.
@@ -1313,7 +1313,7 @@
| `<producer-id>` | Id of the producer |
| `<status>` | The expected status string |
-## Function: ecs_api_edp_get_producer_ids() ##
+## Function: ics_api_edp_get_producer_ids() ##
Test of GET '/ei-producer/v1/eiproducers' and optional check of the returned producer ids.
To test the response code only, provide the response.
@@ -1329,9 +1329,9 @@
| `<producer-id>` | Id of the producer |
| `EMPTY` | The expected list of type ids shall be empty |
-## Function: ecs_api_edp_get_producer_ids_2() ##
+## Function: ics_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.
+Test of GET '/ei-producer/v1/eiproducers' or '/data-producer/v1/info-producers' depending on ics 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).
@@ -1347,7 +1347,7 @@
| `<producer-id>` | Id of the producer |
| `EMPTY` | The expected list of type ids shall be empty |
-## Function: ecs_api_edp_get_type() ##
+## Function: ics_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.
@@ -1365,9 +1365,9 @@
| `<producer-id>` | Id of the producer |
| `EMPTY` | The expected list of type ids shall be empty |
-## Function: ecs_api_edp_get_type_2() ##
+## Function: ics_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.
+Test of GET '/ei-producer/v1/eitypes/{eiTypeId}' or '/data-producer/v1/info-types/{infoTypeId}' depending on ics 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.
@@ -1382,9 +1382,9 @@
| `<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() ##
+## Function: ics_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.
+Test of PUT '/ei-producer/v1/eitypes/{eiTypeId}' or '/data-producer/v1/info-types/{infoTypeId}' depending on ics version and optional check of the returned type.
| arg list |
|--|
@@ -1397,9 +1397,9 @@
| `<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() ##
+## Function: ics_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.
+Test of DELETE '/ei-producer/v1/eitypes/{eiTypeId}' or '/data-producer/v1/info-types/{infoTypeId}' depending on ics version and optional check of the returned type.
| arg list |
|--|
@@ -1410,7 +1410,7 @@
| `<response-code>` | Expected http response code |
| `<type-id>` | Id of the type |
-## Function: ecs_api_edp_get_producer() ##
+## Function: ics_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.
@@ -1431,9 +1431,9 @@
| `<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() ##
+## Function: ics_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.
+Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}' or '/data-producer/v1/info-producers/{infoProducerId}' depending on ics 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.
@@ -1450,9 +1450,9 @@
| `<type-id>` | Id of the type |
| `EMPTY` | The expected list of types shall be empty |
-## Function: ecs_api_edp_delete_producer() ##
+## Function: ics_api_edp_delete_producer() ##
-Test of DELETE '/ei-producer/v1/eiproducers/{eiProducerId}' or '/data-producer/v1/info-producers/{infoProducerId}' depending on ecs version.
+Test of DELETE '/ei-producer/v1/eiproducers/{eiProducerId}' or '/data-producer/v1/info-producers/{infoProducerId}' depending on ics version.
To test, provide all parameters.
| arg list |
@@ -1464,7 +1464,7 @@
| `<response-code>` | Expected http response code |
| `<producer-id>` | Id of the producer |
-## Function: ecs_api_edp_put_producer() ##
+## Function: ics_api_edp_put_producer() ##
Test of PUT '/ei-producer/v1/eiproducers/{eiProducerId}'.
To test, provide all parameters. The list of type/schema pair may be empty.
@@ -1483,9 +1483,9 @@
| `<schema-file>` | Path to a schema file |
| `EMPTY` | The list of type/schema pairs is empty |
-## Function: ecs_api_edp_put_producer_2() ##
+## Function: ics_api_edp_put_producer_2() ##
-Test of PUT '/ei-producer/v1/eiproducers/{eiProducerId}' or '/data-producer/v1/info-producers/{infoProducerId}' depending on ecs version.
+Test of PUT '/ei-producer/v1/eiproducers/{eiProducerId}' or '/data-producer/v1/info-producers/{infoProducerId}' depending on ics version.
To test, provide all parameters. The list of type/schema pair may be empty.
| arg list |
@@ -1501,7 +1501,7 @@
| `<type-id>` | Id of the type |
| `NOTYPE` | The list of types is empty |
-## Function: ecs_api_edp_get_producer_jobs() ##
+## Function: ics_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.
@@ -1522,9 +1522,9 @@
| `<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() ##
+## Function: ics_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.
+Test of GET '/ei-producer/v1/eiproducers/{eiProducerId}/eijobs' or '/data-producer/v1/info-producers/{infoProducerId}/info-jobs' depending on ics 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.
@@ -1543,7 +1543,7 @@
| `<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() ##
+## Function: ics_api_service_status() ##
Test of GET '/status'.
@@ -1555,7 +1555,7 @@
| --------- | ----------- |
| `<response-code>` | Expected http response code |
-## Function: ecs_api_idc_get_type_ids() ##
+## Function: ics_api_idc_get_type_ids() ##
Test of GET '/data-consumer/v1/info-types' and an optional check of the returned list of type ids.
To test the response code only, provide the response code.
@@ -1571,7 +1571,7 @@
| `<type-id>` | Id of the Info type |
| `EMPTY` | The expected list of type ids shall be empty |
-## Function: ecs_api_idc_get_job_ids() ##
+## Function: ics_api_idc_get_job_ids() ##
Test of GET '/data-consumer/v1/info-jobs' and optional check of the array of returned job ids.
To test the response code only, provide the response code parameter as well as a type id and an owner id.
@@ -1590,7 +1590,7 @@
| `<job-id>` | Id of the expected job |
| `EMPTY` | The expected list of job id shall be empty |
-## Function: ecs_api_idc_get_job() ##
+## Function: ics_api_idc_get_job() ##
Test of GET '/data-consumer/v1/info-jobs/{infoJobId}' and optional check of the returned job.
To test the response code only, provide the response code, type id and job id.
@@ -1609,7 +1609,7 @@
| `<owner-id>` | Expected owner for the job |
| `<template-job-file>` | Path to a job template for job parameters of the job |
-## Function: ecs_api_idc_put_job() ##
+## Function: ics_api_idc_put_job() ##
Test of PUT '/data-consumer/v1/info-jobs/{infoJobId}'.
To test, provide all the specified parameters.
@@ -1628,7 +1628,7 @@
| `<template-job-file>` | Path to a job template for job parameters of the job |
| `VALIIDATE` | Indicator to preform type validation at creation |
-## Function: ecs_api_idc_delete_job() ##
+## Function: ics_api_idc_delete_job() ##
Test of DELETE '/A1-EI/v1/eitypes/{eiTypeId}/eijobs/{eiJobId}'.
To test, provide all the specified parameters.
@@ -1643,7 +1643,7 @@
| `<type-id>` | Id of the type |
| `<job-id>` | Id of the job |
-## Function: ecs_api_idc_get_type() ##
+## Function: ics_api_idc_get_type() ##
Test of GET '/data-consumer/v1/info-types/{infoTypeId} and optional check of the returned schema.
To test the response code only, provide the response code parameter as well as the type-id.
@@ -1659,7 +1659,7 @@
| `<type-id>` | Id of the Info type |
| `<schema-file>` | Path to a schema file to compare with the returned schema |
-## Function: ecs_api_idc_get_job_status() ##
+## Function: ics_api_idc_get_job_status() ##
Test of GET '/data-consumer/v1/info-jobs/{infoJobId}/status' and optional check of the returned status and timeout.
To test the response code only, provide the response code and job id.
@@ -1676,7 +1676,7 @@
| `<status>` | Expected status |
| `<timeout>` | Timeout |
-## Function: ecs_api_idc_get_job_status2() ##
+## Function: ics_api_idc_get_job_status2() ##
Test of GET '/data-consumer/v1/info-jobs/{infoJobId}/status' with returned producers and optional check of the returned status and timeout.
To test the response code only, provide the response code and job id.
@@ -1697,7 +1697,7 @@
| `<timeout>` | Timeout |
-## Function: ecs_api_idc_get_subscription_ids() ##
+## Function: ics_api_idc_get_subscription_ids() ##
Test of GET '/data-consumer/v1/info-type-subscription' with the returned list of subscription ids
| arg list |
@@ -1712,7 +1712,7 @@
| `<EMPTY>` | Indicated for empty list of subscription ids |
| `<subscription-id>` |Id of the subscription |
-## Function: ecs_api_idc_get_subscription() ##
+## Function: ics_api_idc_get_subscription() ##
Test of GET '/data-consumer/v1/info-type-subscription/{subscriptionId}' with the subscription information
| arg list |
@@ -1727,7 +1727,7 @@
| `<status-uri>` | Url for status notifications |
-## Function: ecs_api_idc_put_subscription() ##
+## Function: ics_api_idc_put_subscription() ##
Test of PUT '/data-consumer/v1/info-type-subscription/{subscriptionId}' with the subscription information
| arg list |
@@ -1741,7 +1741,7 @@
| `<owner-id>` | Id of the owner |
| `<status-uri>` | Url for status notifications |
-## Function: ecs_api_idc_delete_subscription() ##
+## Function: ics_api_idc_delete_subscription() ##
Test of DELETE /data-consumer/v1/info-type-subscription/{subscriptionId}
| arg list |
@@ -1754,7 +1754,7 @@
| `<subscription-id>` |Id of the subscription |
-## Function: ecs_api_admin_reset() ##
+## Function: ics_api_admin_reset() ##
Test of GET '/status'.
@@ -1815,9 +1815,9 @@
| --------- | ----------- |
| `<response-code>` | Expected http response code |
-## Function: gateway_ecs_get_types ##
+## Function: gateway_ics_get_types ##
-Sample test of ecs api (get types)
+Sample test of ics api (get types)
Only response code tested - not payload
| arg list |
|--|
diff --git a/test/common/api_curl.sh b/test/common/api_curl.sh
index f2777eb..fcf3d1e 100644
--- a/test/common/api_curl.sh
+++ b/test/common/api_curl.sh
@@ -17,13 +17,13 @@
# ============LICENSE_END=================================================
#
-# Generic function to query the agent/ECS via the REST or DMAAP interface.
-# Used by all other agent/ECS api test functions
+# Generic function to query the agent/ICS via the REST or DMAAP interface.
+# Used by all other agent/ICS api test functions
# If operation sufffix is '_BATCH' the the send and get response is split in two sequences,
# one for sending the requests and one for receiving the response
# but only when using the DMAAP interface
# REST or DMAAP is controlled of the base url of $XX_ADAPTER
-# arg: (PA|ECS|CR|RC GET|PUT|POST|DELETE|GET_BATCH|PUT_BATCH|POST_BATCH|DELETE_BATCH <url>|<correlation-id> [<file> [mime-type]]) | (PA|ECS RESPONSE <correlation-id>)
+# arg: (PA|ICS|CR|RC GET|PUT|POST|DELETE|GET_BATCH|PUT_BATCH|POST_BATCH|DELETE_BATCH <url>|<correlation-id> [<file> [mime-type]]) | (PA|ICS RESPONSE <correlation-id>)
# Default mime type for file is application/json unless specified in parameter mime-type
# (Not for test scripts)
__do_curl_to_api() {
@@ -49,10 +49,10 @@
if [ $PMS_VERSION != "V1" ]; then
input_url=$PMS_API_PREFIX$3
fi
- elif [ $1 == "ECS" ]; then
- __ADAPTER=$ECS_ADAPTER
- __ADAPTER_TYPE=$ECS_ADAPTER_TYPE
- __RETRY_CODES=$ECS_RETRY_CODES
+ elif [ $1 == "ICS" ]; then
+ __ADAPTER=$ICS_ADAPTER
+ __ADAPTER_TYPE=$ICS_ADAPTER_TYPE
+ __RETRY_CODES=$ICS_RETRY_CODES
elif [ $1 == "CR" ]; then
__ADAPTER=$CR_ADAPTER
__ADAPTER_TYPE=$CR_ADAPTER_TYPE
@@ -151,7 +151,7 @@
if [ $paramError -eq 1 ]; then
((RES_CONF_FAIL++))
echo "-Incorrect number of parameters to __do_curl_to_api " $@ >> $HTTPLOG
- echo "-Expected: (PA|ECS GET|PUT|POST|DELETE|GET_BATCH|PUT_BATCH|POST_BATCH|DELETE_BATCH <url> [<file>]) | (PA|ECS RESPONSE <correlation-id>)" >> $HTTPLOG
+ echo "-Expected: (PA|ICS GET|PUT|POST|DELETE|GET_BATCH|PUT_BATCH|POST_BATCH|DELETE_BATCH <url> [<file>]) | (PA|ICS RESPONSE <correlation-id>)" >> $HTTPLOG
echo "-Returning response 000" >> $HTTPLOG
echo "-000"
return 1
@@ -248,7 +248,7 @@
echo " RESP: "$res >> $HTTPLOG
status=${res:${#res}-3}
TS=$SECONDS
- # wait of the reply from the agent/ECS...
+ # wait of the reply from the agent/ICS...
while [ $status -eq 204 ]; do
if [ $(($SECONDS - $TS)) -gt 90 ]; then
echo " RETCODE: (timeout after 90s)" >> $HTTPLOG
diff --git a/test/common/cp_api_functions.sh b/test/common/cp_api_functions.sh
index 295e16a..992fd68 100644
--- a/test/common/cp_api_functions.sh
+++ b/test/common/cp_api_functions.sh
@@ -129,7 +129,7 @@
# args: <protocol> <internal-port> <external-port>
__control_panel_set_protocoll() {
echo -e $BOLD"$CONTROL_PANEL_DISPLAY_NAME protocol setting"$EBOLD
- echo -e " Using $BOLD http $EBOLD towards $CONTROL_PANEL_DISPLAY_NAME"
+ echo -e " Using $BOLD $1 $EBOLD towards $CONTROL_PANEL_DISPLAY_NAME"
CP_SERVICE_PATH=$1"://"$CONTROL_PANEL_APP_NAME":"$2
if [ $RUNMODE == "KUBE" ]; then
@@ -160,21 +160,21 @@
export CP_PROXY_CONFIGMAP_NAME=$CONTROL_PANEL_APP_NAME"-proxy"
export CONTROL_PANEL_PATH_POLICY_PREFIX
- export CONTROL_PANEL_PATH_ECS_PREFIX
- export CONTROL_PANEL_PATH_ECS_PREFIX2
+ export CONTROL_PANEL_PATH_ICS_PREFIX
+ export CONTROL_PANEL_PATH_ICS_PREFIX2
export NRT_GATEWAY_APP_NAME
export NRT_GATEWAY_EXTERNAL_PORT
export POLICY_AGENT_EXTERNAL_SECURE_PORT
- export ECS_EXTERNAL_SECURE_PORT
+ export ICS_EXTERNAL_SECURE_PORT
if [ $RUNMODE == "KUBE" ]; then
export NGW_DOMAIN_NAME=$NRT_GATEWAY_APP_NAME.$KUBE_NONRTRIC_NAMESPACE.svc.cluster.local # suffix needed for nginx name resolution
export CP_NGINX_RESOLVER=$CONTROL_PANEL_NGINX_KUBE_RESOLVER
else
export POLICY_AGENT_DOMAIN_NAME=$POLICY_AGENT_APP_NAME
- export ECS_DOMAIN_NAME=$ECS_APP_NAME
+ export ICS_DOMAIN_NAME=$ICS_APP_NAME
export NGW_DOMAIN_NAME=$NRT_GATEWAY_APP_NAME
export CP_NGINX_RESOLVER=$CONTROL_PANEL_NGINX_DOCKER_RESOLVER
@@ -270,7 +270,7 @@
dest_file=$SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_HOST_MNT_DIR/$CONTROL_PANEL_CONFIG_FILE
- envsubst '${NGW_DOMAIN_NAME},${CP_NGINX_RESOLVER},${NRT_GATEWAY_EXTERNAL_PORT},${POLICY_AGENT_EXTERNAL_SECURE_PORT},${ECS_EXTERNAL_SECURE_PORT},${POLICY_AGENT_DOMAIN_NAME},${ECS_DOMAIN_NAME},${CONTROL_PANEL_PATH_POLICY_PREFIX},${CONTROL_PANEL_PATH_ECS_PREFIX} ,${CONTROL_PANEL_PATH_ECS_PREFIX2}' < $1 > $dest_file
+ envsubst '${NGW_DOMAIN_NAME},${CP_NGINX_RESOLVER},${NRT_GATEWAY_EXTERNAL_PORT},${POLICY_AGENT_EXTERNAL_SECURE_PORT},${ICS_EXTERNAL_SECURE_PORT},${POLICY_AGENT_DOMAIN_NAME},${ICS_DOMAIN_NAME},${CONTROL_PANEL_PATH_POLICY_PREFIX},${CONTROL_PANEL_PATH_ICS_PREFIX} ,${CONTROL_PANEL_PATH_ICS_PREFIX2}' < $1 > $dest_file
__start_container $CONTROL_PANEL_COMPOSE_DIR "" NODOCKERARGS 1 $CONTROL_PANEL_APP_NAME
diff --git a/test/common/cr_api_functions.sh b/test/common/cr_api_functions.sh
index 1b82ea0..5116273 100644
--- a/test/common/cr_api_functions.sh
+++ b/test/common/cr_api_functions.sh
@@ -160,7 +160,7 @@
__cr_set_protocoll() {
echo -e $BOLD"$CR_DISPLAY_NAME protocol setting"$EBOLD
- echo -e " Using $BOLD http $EBOLD towards $CR_DISPLAY_NAME"
+ echo -e " Using $BOLD $1 $EBOLD towards $CR_DISPLAY_NAME"
## Access to Dmaap adapter
for ((CR_INSTANCE=0; CR_INSTANCE<$MAX_CR_APP_COUNT; CR_INSTANCE++ )); do
CR_DOCKER_INSTANCE=$(($CR_INSTANCE+1))
@@ -489,10 +489,10 @@
return 0
}
-# CR API: Check the contents of all current status events for one id from ECS
+# CR API: Check the contents of all current status events for one id from ICS
# <response-code> <cr-path-id> <id> [ EMPTY | ( <status> )+ ]
# (Function for test scripts)
-cr_api_check_all_ecs_events() {
+cr_api_check_all_ics_events() {
__log_test_start $@
if [ $# -lt 3 ]; then
@@ -546,10 +546,10 @@
return 0
}
-# CR API: Check the contents of all current type subscription events for one id from ECS
+# CR API: Check the contents of all current type subscription events for one id from ICS
# <response-code> <cr-path-id> <id> [ EMPTY | ( <type-id> <schema> <registration-status> )+ ]
# (Function for test scripts)
-cr_api_check_all_ecs_subscription_events() {
+cr_api_check_all_ics_subscription_events() {
__log_test_start $@
#Valid number of parameter 3,4,8,12
@@ -625,7 +625,7 @@
cr_api_reset() {
__log_conf_start $@
- if [ $# -ne 0 ]; then
+ if [ $# -ne 1 ]; then
__print_err "<cr-path-id>" $@
return 1
fi
diff --git a/test/common/dmaapadp_api_functions.sh b/test/common/dmaapadp_api_functions.sh
index 9b7571f..a9605ec 100644
--- a/test/common/dmaapadp_api_functions.sh
+++ b/test/common/dmaapadp_api_functions.sh
@@ -124,7 +124,7 @@
# args: <protocol> <internal-port> <external-port>
__dmaapadp_set_protocoll() {
echo -e $BOLD"$DMAAP_ADP_DISPLAY_NAME protocol setting"$EBOLD
- echo -e " Using $BOLD http $EBOLD towards $DMAAP_ADP_DISPLAY_NAME"
+ echo -e " Using $BOLD $1 $EBOLD towards $DMAAP_ADP_DISPLAY_NAME"
## Access to Dmaap adapter
@@ -185,7 +185,7 @@
# paths to other components
- export ECS_SERVICE_PATH
+ export ICS_SERVICE_PATH
export DMAAP_ADP_SERVICE_PATH
export MR_SERVICE_PATH
diff --git a/test/common/dmaapmed_api_functions.sh b/test/common/dmaapmed_api_functions.sh
index 5188a45..35280a4 100644
--- a/test/common/dmaapmed_api_functions.sh
+++ b/test/common/dmaapmed_api_functions.sh
@@ -124,7 +124,7 @@
# args: <protocol> <internal-port> <external-port>
__dmaapmed_set_protocoll() {
echo -e $BOLD"$DMAAP_MED_DISPLAY_NAME protocol setting"$EBOLD
- echo -e " Using $BOLD http $EBOLD towards $DMAAP_MED_DISPLAY_NAME"
+ echo -e " Using $BOLD $1 $EBOLD towards $DMAAP_MED_DISPLAY_NAME"
## Access to Dmaap mediator
@@ -177,7 +177,7 @@
fi
# paths to other components
- export ECS_SERVICE_PATH
+ export ICS_SERVICE_PATH
export DMAAP_MED_CONF_SELF_HOST=$(echo $DMAAP_MED_SERVICE_PATH | cut -d: -f1-2)
export DMAAP_MED_CONF_SELF_PORT=$(echo $DMAAP_MED_SERVICE_PATH | cut -d: -f3)
diff --git a/test/common/ecs_api_functions.sh b/test/common/ics_api_functions.sh
similarity index 82%
rename from test/common/ecs_api_functions.sh
rename to test/common/ics_api_functions.sh
index b28c061..ea4036d 100644
--- a/test/common/ecs_api_functions.sh
+++ b/test/common/ics_api_functions.sh
@@ -17,15 +17,15 @@
# ============LICENSE_END=================================================
#
-# This is a script that contains container/service management functions and test functions for ECS
+# This is a script that contains container/service management functions and test functions for ICS
################ Test engine functions ################
# Create the image var used during the test
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
-__ECS_imagesetup() {
- __check_and_create_image_var ECS "ECS_IMAGE" "ECS_IMAGE_BASE" "ECS_IMAGE_TAG" $1 "$ECS_DISPLAY_NAME"
+__ICS_imagesetup() {
+ __check_and_create_image_var ICS "ICS_IMAGE" "ICS_IMAGE_BASE" "ICS_IMAGE_TAG" $1 "$ICS_DISPLAY_NAME"
}
# Pull image from remote repo or use locally built image
@@ -33,276 +33,276 @@
# <pull-policy-override> Shall be used for images allowing overriding. For example use a local image when test is started to use released images
# <pull-policy-original> Shall be used for images that does not allow overriding
# Both var may contain: 'remote', 'remote-remove' or 'local'
-__ECS_imagepull() {
- __check_and_pull_image $1 "$ECS_DISPLAY_NAME" $ECS_APP_NAME ECS_IMAGE
+__ICS_imagepull() {
+ __check_and_pull_image $1 "$ICS_DISPLAY_NAME" $ICS_APP_NAME ICS_IMAGE
}
# Build image (only for simulator or interfaces stubs owned by the test environment)
# arg: <image-tag-suffix> (selects staging, snapshot, release etc)
# <image-tag-suffix> is present only for images with staging, snapshot,release tags
-__ECS_imagebuild() {
- echo -e $RED" Image for app ECS shall never be built"$ERED
+__ICS_imagebuild() {
+ echo -e $RED" Image for app ICS shall never be built"$ERED
}
# Generate a string for each included image using the app display name and a docker images format string
# If a custom image repo is used then also the source image from the local repo is listed
# arg: <docker-images-format-string> <file-to-append>
-__ECS_image_data() {
- echo -e "$ECS_DISPLAY_NAME\t$(docker images --format $1 $ECS_IMAGE)" >> $2
- if [ ! -z "$ECS_IMAGE_SOURCE" ]; then
- echo -e "-- source image --\t$(docker images --format $1 $ECS_IMAGE_SOURCE)" >> $2
+__ICS_image_data() {
+ echo -e "$ICS_DISPLAY_NAME\t$(docker images --format $1 $ICS_IMAGE)" >> $2
+ if [ ! -z "$ICS_IMAGE_SOURCE" ]; then
+ echo -e "-- source image --\t$(docker images --format $1 $ICS_IMAGE_SOURCE)" >> $2
fi
}
# Scale kubernetes resources to zero
# All resources shall be ordered to be scaled to 0, if relevant. If not relevant to scale, then do no action.
# This function is called for apps fully managed by the test script
-__ECS_kube_scale_zero() {
- __kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ECS
+__ICS_kube_scale_zero() {
+ __kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ICS
}
# Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
# This function is called for prestarted apps not managed by the test script.
-__ECS_kube_scale_zero_and_wait() {
- __kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-enrichmentservice
+__ICS_kube_scale_zero_and_wait() {
+ __kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-informationservice
}
# Delete all kube resouces for the app
# This function is called for apps managed by the test script.
-__ECS_kube_delete_all() {
- __kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ECS
+__ICS_kube_delete_all() {
+ __kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ICS
}
# Store docker logs
# This function is called for apps managed by the test script.
# args: <log-dir> <file-prexix>
-__ECS_store_docker_logs() {
+__ICS_store_docker_logs() {
if [ $RUNMODE == "KUBE" ]; then
- kubectl logs -l "autotest=ECS" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_ecs.log 2>&1
+ kubectl logs -l "autotest=ICS" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_ics.log 2>&1
else
- docker logs $ECS_APP_NAME > $1$2_ecs.log 2>&1
+ docker logs $ICS_APP_NAME > $1$2_ics.log 2>&1
fi
}
# Initial setup of protocol, host and ports
# This function is called for apps managed by the test script.
# args: -
-__ECS_initial_setup() {
- use_ecs_rest_http
+__ICS_initial_setup() {
+ use_ics_rest_http
}
# Set app short-name, app name and namespace for logging runtime statistics of kubernets pods or docker containers
# For docker, the namespace shall be excluded
# This function is called for apps managed by the test script as well as for prestarted apps.
# args: -
-__ECS_statisics_setup() {
+__ICS_statisics_setup() {
if [ $RUNMODE == "KUBE" ]; then
- echo "ECS $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE"
+ echo "ICS $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE"
else
- echo "ECS $ECS_APP_NAME"
+ echo "ICS $ICS_APP_NAME"
fi
}
#######################################################
-# Make curl retries towards ECS for http response codes set in this env var, space separated list of codes
-ECS_RETRY_CODES=""
+# Make curl retries towards ICS for http response codes set in this env var, space separated list of codes
+ICS_RETRY_CODES=""
#Save first worker node the pod is started on
-__ECS_WORKER_NODE=""
+__ICS_WORKER_NODE=""
###########################
-### ECS functions
+### ICS functions
###########################
-# All calls to ECS will be directed to the ECS REST interface from now on
+# All calls to ICS will be directed to the ICS REST interface from now on
# args: -
# (Function for test scripts)
-use_ecs_rest_http() {
- __ecs_set_protocoll "http" $ECS_INTERNAL_PORT $ECS_EXTERNAL_PORT
+use_ics_rest_http() {
+ __ics_set_protocoll "http" $ICS_INTERNAL_PORT $ICS_EXTERNAL_PORT
}
-# All calls to ECS will be directed to the ECS REST interface from now on
+# All calls to ICS will be directed to the ICS REST interface from now on
# args: -
# (Function for test scripts)
-use_ecs_rest_https() {
- __ecs_set_protocoll "https" $ECS_INTERNAL_SECURE_PORT $ECS_EXTERNAL_SECURE_PORT
+use_ics_rest_https() {
+ __ics_set_protocoll "https" $ICS_INTERNAL_SECURE_PORT $ICS_EXTERNAL_SECURE_PORT
}
-# All calls to ECS will be directed to the ECS dmaap interface over http from now on
+# All calls to ICS will be directed to the ICS dmaap interface over http from now on
# args: -
# (Function for test scripts)
-use_ecs_dmaap_http() {
- echo -e $BOLD"ECS dmaap protocol setting"$EBOLD
+use_ics_dmaap_http() {
+ echo -e $BOLD"ICS dmaap protocol setting"$EBOLD
echo -e $RED" - NOT SUPPORTED - "$ERED
- echo -e " Using $BOLD http $EBOLD and $BOLD DMAAP $EBOLD towards ECS"
- ECS_ADAPTER_TYPE="MR-HTTP"
+ echo -e " Using $BOLD http $EBOLD and $BOLD DMAAP $EBOLD towards ICS"
+ ICS_ADAPTER_TYPE="MR-HTTP"
echo ""
}
# Setup paths to svc/container for internal and external access
# args: <protocol> <internal-port> <external-port>
-__ecs_set_protocoll() {
- echo -e $BOLD"$ECS_DISPLAY_NAME protocol setting"$EBOLD
- echo -e " Using $BOLD http $EBOLD towards $ECS_DISPLAY_NAME"
+__ics_set_protocoll() {
+ echo -e $BOLD"$ICS_DISPLAY_NAME protocol setting"$EBOLD
+ echo -e " Using $BOLD $1 $EBOLD towards $ICS_DISPLAY_NAME"
- ## Access to ECS
+ ## Access to ICS
- ECS_SERVICE_PATH=$1"://"$ECS_APP_NAME":"$2 # docker access, container->container and script->container via proxy
+ ICS_SERVICE_PATH=$1"://"$ICS_APP_NAME":"$2 # docker access, container->container and script->container via proxy
if [ $RUNMODE == "KUBE" ]; then
- ECS_SERVICE_PATH=$1"://"$ECS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE":"$3 # kube access, pod->svc and script->svc via proxy
+ ICS_SERVICE_PATH=$1"://"$ICS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE":"$3 # kube access, pod->svc and script->svc via proxy
fi
- # ECS_ADAPTER used for switching between REST and DMAAP (only REST supported currently)
- ECS_ADAPTER_TYPE="REST"
- ECS_ADAPTER=$ECS_SERVICE_PATH
+ # ICS_ADAPTER used for switching between REST and DMAAP (only REST supported currently)
+ ICS_ADAPTER_TYPE="REST"
+ ICS_ADAPTER=$ICS_SERVICE_PATH
echo ""
}
# Export env vars for config files, docker compose and kube resources
# args: PROXY|NOPROXY
-__ecs_export_vars() {
- export ECS_APP_NAME
- export ECS_APP_NAME_ALIAS
+__ics_export_vars() {
+ export ICS_APP_NAME
+ export ICS_APP_NAME_ALIAS
export KUBE_NONRTRIC_NAMESPACE
- export ECS_IMAGE
- export ECS_INTERNAL_PORT
- export ECS_INTERNAL_SECURE_PORT
- export ECS_EXTERNAL_PORT
- export ECS_EXTERNAL_SECURE_PORT
- export ECS_CONFIG_MOUNT_PATH
- export ECS_CONFIG_CONFIGMAP_NAME=$ECS_APP_NAME"-config"
- export ECS_DATA_CONFIGMAP_NAME=$ECS_APP_NAME"-data"
- export ECS_CONTAINER_MNT_DIR
- export ECS_HOST_MNT_DIR
- export ECS_CONFIG_FILE
+ export ICS_IMAGE
+ export ICS_INTERNAL_PORT
+ export ICS_INTERNAL_SECURE_PORT
+ export ICS_EXTERNAL_PORT
+ export ICS_EXTERNAL_SECURE_PORT
+ export ICS_CONFIG_MOUNT_PATH
+ export ICS_CONFIG_CONFIGMAP_NAME=$ICS_APP_NAME"-config"
+ export ICS_DATA_CONFIGMAP_NAME=$ICS_APP_NAME"-data"
+ export ICS_CONTAINER_MNT_DIR
+ export ICS_HOST_MNT_DIR
+ export ICS_CONFIG_FILE
export DOCKER_SIM_NWNAME
- export ECS_DISPLAY_NAME
+ export ICS_DISPLAY_NAME
- export ECS_DATA_PV_NAME=$ECS_APP_NAME"-pv"
- export ECS_DATA_PVC_NAME=$ECS_APP_NAME"-pvc"
+ export ICS_DATA_PV_NAME=$ICS_APP_NAME"-pv"
+ export ICS_DATA_PVC_NAME=$ICS_APP_NAME"-pvc"
#Create a unique path for the pv each time to prevent a previous volume to be reused
- export ECS_PV_PATH="ecsdata-"$(date +%s)
+ export ICS_PV_PATH="icsdata-"$(date +%s)
if [ $1 == "PROXY" ]; then
- export ECS_HTTP_PROXY_CONFIG_PORT=$HTTP_PROXY_CONFIG_PORT #Set if proxy is started
- export ECS_HTTP_PROXY_CONFIG_HOST_NAME=$HTTP_PROXY_CONFIG_HOST_NAME #Set if proxy is started
- if [ $ECS_HTTP_PROXY_CONFIG_PORT -eq 0 ] || [ -z "$ECS_HTTP_PROXY_CONFIG_HOST_NAME" ]; then
+ export ICS_HTTP_PROXY_CONFIG_PORT=$HTTP_PROXY_CONFIG_PORT #Set if proxy is started
+ export ICS_HTTP_PROXY_CONFIG_HOST_NAME=$HTTP_PROXY_CONFIG_HOST_NAME #Set if proxy is started
+ if [ $ICS_HTTP_PROXY_CONFIG_PORT -eq 0 ] || [ -z "$ICS_HTTP_PROXY_CONFIG_HOST_NAME" ]; then
echo -e $YELLOW" Warning: HTTP PROXY will not be configured, proxy app not started"$EYELLOW
else
echo " Configured with http proxy"
fi
else
- export ECS_HTTP_PROXY_CONFIG_PORT=0
- export ECS_HTTP_PROXY_CONFIG_HOST_NAME=""
+ export ICS_HTTP_PROXY_CONFIG_PORT=0
+ export ICS_HTTP_PROXY_CONFIG_HOST_NAME=""
echo " Configured without http proxy"
fi
}
-# Start the ECS
+# Start the ICS
# args: PROXY|NOPROXY <config-file>
# (Function for test scripts)
-start_ecs() {
+start_ics() {
- echo -e $BOLD"Starting $ECS_DISPLAY_NAME"$EBOLD
+ echo -e $BOLD"Starting $ICS_DISPLAY_NAME"$EBOLD
if [ $RUNMODE == "KUBE" ]; then
# Check if app shall be fully managed by the test script
- __check_included_image "ECS"
+ __check_included_image "ICS"
retcode_i=$?
# Check if app shall only be used by the testscipt
- __check_prestarted_image "ECS"
+ __check_prestarted_image "ICS"
retcode_p=$?
if [ $retcode_i -ne 0 ] && [ $retcode_p -ne 0 ]; then
- echo -e $RED"The $ECS_APP_NAME app is not included as managed nor prestarted in this test script"$ERED
- echo -e $RED"The $ECS_APP_NAME will not be started"$ERED
+ echo -e $RED"The $ICS_APP_NAME app is not included as managed nor prestarted in this test script"$ERED
+ echo -e $RED"The $ICS_APP_NAME will not be started"$ERED
exit
fi
if [ $retcode_i -eq 0 ] && [ $retcode_p -eq 0 ]; then
- echo -e $RED"The $ECS_APP_NAME app is included both as managed and prestarted in this test script"$ERED
- echo -e $RED"The $ECS_APP_NAME will not be started"$ERED
+ echo -e $RED"The $ICS_APP_NAME app is included both as managed and prestarted in this test script"$ERED
+ echo -e $RED"The $ICS_APP_NAME will not be started"$ERED
exit
fi
if [ $retcode_p -eq 0 ]; then
- echo -e " Using existing $ECS_APP_NAME deployment and service"
- echo " Setting ECS replicas=1"
- res_type=$(__kube_get_resource_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
- __kube_scale $res_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
+ echo -e " Using existing $ICS_APP_NAME deployment and service"
+ echo " Setting ICS replicas=1"
+ res_type=$(__kube_get_resource_type $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
+ __kube_scale $res_type $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
fi
# Check if app shall be fully managed by the test script
if [ $retcode_i -eq 0 ]; then
- echo -e " Creating $ECS_APP_NAME app and expose service"
+ echo -e " Creating $ICS_APP_NAME app and expose service"
#Check if nonrtric namespace exists, if not create it
__kube_create_namespace $KUBE_NONRTRIC_NAMESPACE
- __ecs_export_vars $1
+ __ics_export_vars $1
# Create config map for config
- datafile=$PWD/tmp/$ECS_CONFIG_FILE
+ datafile=$PWD/tmp/$ICS_CONFIG_FILE
cp $2 $datafile
- output_yaml=$PWD/tmp/ecs_cfc.yaml
- __kube_create_configmap $ECS_CONFIG_CONFIGMAP_NAME $KUBE_NONRTRIC_NAMESPACE autotest ECS $datafile $output_yaml
+ output_yaml=$PWD/tmp/ics_cfc.yaml
+ __kube_create_configmap $ICS_CONFIG_CONFIGMAP_NAME $KUBE_NONRTRIC_NAMESPACE autotest ICS $datafile $output_yaml
# Create pv
- input_yaml=$SIM_GROUP"/"$ECS_COMPOSE_DIR"/"pv.yaml
- output_yaml=$PWD/tmp/ecs_pv.yaml
- __kube_create_instance pv $ECS_APP_NAME $input_yaml $output_yaml
+ input_yaml=$SIM_GROUP"/"$ICS_COMPOSE_DIR"/"pv.yaml
+ output_yaml=$PWD/tmp/ics_pv.yaml
+ __kube_create_instance pv $ICS_APP_NAME $input_yaml $output_yaml
# Create pvc
- input_yaml=$SIM_GROUP"/"$ECS_COMPOSE_DIR"/"pvc.yaml
- output_yaml=$PWD/tmp/ecs_pvc.yaml
- __kube_create_instance pvc $ECS_APP_NAME $input_yaml $output_yaml
+ input_yaml=$SIM_GROUP"/"$ICS_COMPOSE_DIR"/"pvc.yaml
+ output_yaml=$PWD/tmp/ics_pvc.yaml
+ __kube_create_instance pvc $ICS_APP_NAME $input_yaml $output_yaml
# Create service
- input_yaml=$SIM_GROUP"/"$ECS_COMPOSE_DIR"/"svc.yaml
- output_yaml=$PWD/tmp/ecs_svc.yaml
- __kube_create_instance service $ECS_APP_NAME $input_yaml $output_yaml
+ input_yaml=$SIM_GROUP"/"$ICS_COMPOSE_DIR"/"svc.yaml
+ output_yaml=$PWD/tmp/ics_svc.yaml
+ __kube_create_instance service $ICS_APP_NAME $input_yaml $output_yaml
# Create app
- input_yaml=$SIM_GROUP"/"$ECS_COMPOSE_DIR"/"app.yaml
- output_yaml=$PWD/tmp/ecs_app.yaml
- __kube_create_instance app $ECS_APP_NAME $input_yaml $output_yaml
+ input_yaml=$SIM_GROUP"/"$ICS_COMPOSE_DIR"/"app.yaml
+ output_yaml=$PWD/tmp/ics_app.yaml
+ __kube_create_instance app $ICS_APP_NAME $input_yaml $output_yaml
fi
- # Tie the ECS to a worker node so that ECS will always be scheduled to the same worker node if the ECS pod is restarted
- # A PVC of type hostPath is mounted to ECS, for persistent storage, so the ECS must always be on the node which mounted the volume
+ # Tie the ICS to a worker node so that ICS will always be scheduled to the same worker node if the ICS pod is restarted
+ # A PVC of type hostPath is mounted to ICS, for persistent storage, so the ICS must always be on the node which mounted the volume
# Keep the initial worker node in case the pod need to be "restarted" - must be made to the same node due to a volume mounted on the host
if [ $retcode_i -eq 0 ]; then
- __ECS_WORKER_NODE=$(kubectl get pod -l "autotest=ECS" -n $KUBE_NONRTRIC_NAMESPACE -o jsonpath='{.items[*].spec.nodeName}')
- if [ -z "$__ECS_WORKER_NODE" ]; then
- echo -e $YELLOW" Cannot find worker node for pod for $ECS_APP_NAME, persistency may not work"$EYELLOW
+ __ICS_WORKER_NODE=$(kubectl get pod -l "autotest=ICS" -n $KUBE_NONRTRIC_NAMESPACE -o jsonpath='{.items[*].spec.nodeName}')
+ if [ -z "$__ICS_WORKER_NODE" ]; then
+ echo -e $YELLOW" Cannot find worker node for pod for $ICS_APP_NAME, persistency may not work"$EYELLOW
fi
else
- echo -e $YELLOW" Persistency may not work for app $ECS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
+ echo -e $YELLOW" Persistency may not work for app $ICS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
fi
- __check_service_start $ECS_APP_NAME $ECS_SERVICE_PATH$ECS_ALIVE_URL
+ __check_service_start $ICS_APP_NAME $ICS_SERVICE_PATH$ICS_ALIVE_URL
else
- __check_included_image 'ECS'
+ __check_included_image 'ICS'
if [ $? -eq 1 ]; then
- echo -e $RED"The ECS app is not included in this test script"$ERED
- echo -e $RED"ECS will not be started"$ERED
+ echo -e $RED"The ICS app is not included in this test script"$ERED
+ echo -e $RED"ICS will not be started"$ERED
exit 1
fi
curdir=$PWD
cd $SIM_GROUP
- cd ecs
- cd $ECS_HOST_MNT_DIR
+ cd ics
+ cd $ICS_HOST_MNT_DIR
#cd ..
if [ -d db ]; then
if [ "$(ls -A $DIR)" ]; then
@@ -319,49 +319,49 @@
cd $curdir
- __ecs_export_vars $1
+ __ics_export_vars $1
- dest_file=$SIM_GROUP/$ECS_COMPOSE_DIR/$ECS_HOST_MNT_DIR/$ECS_CONFIG_FILE
+ dest_file=$SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_HOST_MNT_DIR/$ICS_CONFIG_FILE
envsubst < $2 > $dest_file
- __start_container $ECS_COMPOSE_DIR "" NODOCKERARGS 1 $ECS_APP_NAME
+ __start_container $ICS_COMPOSE_DIR "" NODOCKERARGS 1 $ICS_APP_NAME
- __check_service_start $ECS_APP_NAME $ECS_SERVICE_PATH$ECS_ALIVE_URL
+ __check_service_start $ICS_APP_NAME $ICS_SERVICE_PATH$ICS_ALIVE_URL
fi
echo ""
return 0
}
-# Stop the ecs
+# Stop the ics
# args: -
# args: -
# (Function for test scripts)
-stop_ecs() {
- echo -e $BOLD"Stopping $ECS_DISPLAY_NAME"$EBOLD
+stop_ics() {
+ echo -e $BOLD"Stopping $ICS_DISPLAY_NAME"$EBOLD
if [ $RUNMODE == "KUBE" ]; then
- __check_prestarted_image "ECS"
+ __check_prestarted_image "ICS"
if [ $? -eq 0 ]; then
- echo -e $YELLOW" Persistency may not work for app $ECS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
- res_type=$(__kube_get_resource_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
- __kube_scale $res_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 0
+ echo -e $YELLOW" Persistency may not work for app $ICS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
+ res_type=$(__kube_get_resource_type $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
+ __kube_scale $res_type $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 0
return 0
fi
- __kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ECS
+ __kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest ICS
echo " Deleting the replica set - a new will be started when the app is started"
- tmp=$(kubectl delete rs -n $KUBE_NONRTRIC_NAMESPACE -l "autotest=ECS")
+ tmp=$(kubectl delete rs -n $KUBE_NONRTRIC_NAMESPACE -l "autotest=ICS")
if [ $? -ne 0 ]; then
echo -e $RED" Could not delete replica set "$RED
((RES_CONF_FAIL++))
return 1
fi
else
- docker stop $ECS_APP_NAME &> ./tmp/.dockererr
+ docker stop $ICS_APP_NAME &> ./tmp/.dockererr
if [ $? -ne 0 ]; then
- __print_err "Could not stop $ECS_APP_NAME" $@
+ __print_err "Could not stop $ICS_APP_NAME" $@
cat ./tmp/.dockererr
((RES_CONF_FAIL++))
return 1
@@ -372,48 +372,48 @@
return 0
}
-# Start a previously stopped ecs
+# Start a previously stopped ics
# args: -
# (Function for test scripts)
-start_stopped_ecs() {
- echo -e $BOLD"Starting (the previously stopped) $ECS_DISPLAY_NAME"$EBOLD
+start_stopped_ics() {
+ echo -e $BOLD"Starting (the previously stopped) $ICS_DISPLAY_NAME"$EBOLD
if [ $RUNMODE == "KUBE" ]; then
- __check_prestarted_image "ECS"
+ __check_prestarted_image "ICS"
if [ $? -eq 0 ]; then
- echo -e $YELLOW" Persistency may not work for app $ECS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
- res_type=$(__kube_get_resource_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
- __kube_scale $res_type $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
- __check_service_start $ECS_APP_NAME $ECS_SERVICE_PATH$ECS_ALIVE_URL
+ echo -e $YELLOW" Persistency may not work for app $ICS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
+ res_type=$(__kube_get_resource_type $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
+ __kube_scale $res_type $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
+ __check_service_start $ICS_APP_NAME $ICS_SERVICE_PATH$ICS_ALIVE_URL
return 0
fi
# Tie the PMS to the same worker node it was initially started on
# A PVC of type hostPath is mounted to PMS, for persistent storage, so the PMS must always be on the node which mounted the volume
- if [ -z "$__ECS_WORKER_NODE" ]; then
+ if [ -z "$__ICS_WORKER_NODE" ]; then
echo -e $RED" No initial worker node found for pod "$RED
((RES_CONF_FAIL++))
return 1
else
- echo -e $BOLD" Setting nodeSelector kubernetes.io/hostname=$__ECS_WORKER_NODE to deployment for $ECS_APP_NAME. Pod will always run on this worker node: $__PA_WORKER_NODE"$BOLD
+ echo -e $BOLD" Setting nodeSelector kubernetes.io/hostname=$__ICS_WORKER_NODE to deployment for $ICS_APP_NAME. Pod will always run on this worker node: $__PA_WORKER_NODE"$BOLD
echo -e $BOLD" The mounted volume is mounted as hostPath and only available on that worker node."$BOLD
- tmp=$(kubectl patch deployment $ECS_APP_NAME -n $KUBE_NONRTRIC_NAMESPACE --patch '{"spec": {"template": {"spec": {"nodeSelector": {"kubernetes.io/hostname": "'$__ECS_WORKER_NODE'"}}}}}')
+ tmp=$(kubectl patch deployment $ICS_APP_NAME -n $KUBE_NONRTRIC_NAMESPACE --patch '{"spec": {"template": {"spec": {"nodeSelector": {"kubernetes.io/hostname": "'$__ICS_WORKER_NODE'"}}}}}')
if [ $? -ne 0 ]; then
- echo -e $YELLOW" Cannot set nodeSelector to deployment for $ECS_APP_NAME, persistency may not work"$EYELLOW
+ echo -e $YELLOW" Cannot set nodeSelector to deployment for $ICS_APP_NAME, persistency may not work"$EYELLOW
fi
- __kube_scale deployment $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
+ __kube_scale deployment $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
fi
else
- docker start $ECS_APP_NAME &> ./tmp/.dockererr
+ docker start $ICS_APP_NAME &> ./tmp/.dockererr
if [ $? -ne 0 ]; then
- __print_err "Could not start (the stopped) $ECS_APP_NAME" $@
+ __print_err "Could not start (the stopped) $ICS_APP_NAME" $@
cat ./tmp/.dockererr
((RES_CONF_FAIL++))
return 1
fi
fi
- __check_service_start $ECS_APP_NAME $ECS_SERVICE_PATH$ECS_ALIVE_URL
+ __check_service_start $ICS_APP_NAME $ICS_SERVICE_PATH$ICS_ALIVE_URL
if [ $? -ne 0 ]; then
return 1
fi
@@ -421,12 +421,12 @@
return 0
}
-# Turn on debug level tracing in ECS
+# Turn on debug level tracing in ICS
# args: -
# (Function for test scripts)
-set_ecs_debug() {
- echo -e $BOLD"Setting ecs debug logging"$EBOLD
- curlString="$ECS_SERVICE_PATH$ECS_ACTUATOR -X POST -H Content-Type:application/json -d {\"configuredLevel\":\"debug\"}"
+set_ics_debug() {
+ echo -e $BOLD"Setting ics debug logging"$EBOLD
+ curlString="$ICS_SERVICE_PATH$ICS_ACTUATOR -X POST -H Content-Type:application/json -d {\"configuredLevel\":\"debug\"}"
result=$(__do_curl "$curlString")
if [ $? -ne 0 ]; then
__print_err "Could not set debug mode" $@
@@ -437,12 +437,12 @@
return 0
}
-# Turn on trace level tracing in ECS
+# Turn on trace level tracing in ICS
# args: -
# (Function for test scripts)
-set_ecs_trace() {
- echo -e $BOLD"Setting ecs trace logging"$EBOLD
- curlString="$ECS_SERVICE_PATH/actuator/loggers/org.oransc.enrichment -X POST -H Content-Type:application/json -d {\"configuredLevel\":\"trace\"}"
+set_ics_trace() {
+ echo -e $BOLD"Setting ics trace logging"$EBOLD
+ curlString="$ICS_SERVICE_PATH/actuator/loggers/org.oransc.information -X POST -H Content-Type:application/json -d {\"configuredLevel\":\"trace\"}"
result=$(__do_curl "$curlString")
if [ $? -ne 0 ]; then
__print_err "Could not set trace mode" $@
@@ -453,50 +453,50 @@
return 0
}
-# Perform curl retries when making direct call to ECS for the specified http response codes
+# Perform curl retries when making direct call to ICS for the specified http response codes
# Speace separated list of http response codes
# args: [<response-code>]*
-use_ecs_retries() {
- echo -e $BOLD"Do curl retries to the ECS REST inteface for these response codes:$@"$EBOLD
- ECS_RETRY_CODES=$@
+use_ics_retries() {
+ echo -e $BOLD"Do curl retries to the ICS REST inteface for these response codes:$@"$EBOLD
+ ICS_RETRY_CODES=$@
echo ""
return 0
}
-# Check the ecs logs for WARNINGs and ERRORs
+# Check the ics logs for WARNINGs and ERRORs
# args: -
# (Function for test scripts)
-check_ecs_logs() {
- __check_container_logs "ECS" $ECS_APP_NAME $ECS_LOGPATH WARN ERR
+check_ics_logs() {
+ __check_container_logs "ICS" $ICS_APP_NAME $ICS_LOGPATH WARN ERR
}
-# Tests if a variable value in the ECS is equal to a target value and and optional timeout.
+# Tests if a variable value in the ICS is equal to a target value and and optional timeout.
# Arg: <variable-name> <target-value> - This test set pass or fail depending on if the variable is
# equal to the target or not.
# Arg: <variable-name> <target-value> <timeout-in-sec> - This test waits up to the timeout seconds
# before setting pass or fail depending on if the variable value becomes equal to the target
# value or not.
# (Function for test scripts)
-ecs_equal() {
+ics_equal() {
if [ $# -eq 2 ] || [ $# -eq 3 ]; then
- __var_test ECS "$ECS_SERVICE_PATH/" $1 "=" $2 $3
+ __var_test ICS "$ICS_SERVICE_PATH/" $1 "=" $2 $3
else
- __print_err "Wrong args to ecs_equal, needs two or three args: <sim-param> <target-value> [ timeout ]" $@
+ __print_err "Wrong args to ics_equal, needs two or three args: <sim-param> <target-value> [ timeout ]" $@
fi
}
##########################################
-######### A1-E Enrichment API ##########
+######### A1-E information API ##########
##########################################
-#Function prefix: ecs_api_a1
+#Function prefix: ics_api_a1
# API Test function: GET /A1-EI/v1/eitypes/{eiTypeId}/eijobs
# args: <response-code> <type-id> <owner-id>|NOOWNER [ EMPTY | <job-id>+ ]
# args (flat uri structure): <response-code> <type-id>|NOTYPE <owner-id>|NOOWNER [ EMPTY | <job-id>+ ]
# (Function for test scripts)
-ecs_api_a1_get_job_ids() {
+ics_api_a1_get_job_ids() {
__log_test_start $@
if [ -z "$FLAT_A1_EI" ]; then
@@ -530,7 +530,7 @@
fi
query="/A1-EI/v1/eijobs$search"
fi
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -568,7 +568,7 @@
# API Test function: GET /A1-EI/v1/eitypes/{eiTypeId}
# args: <response-code> <type-id> [<schema-file>]
# (Function for test scripts)
-ecs_api_a1_get_type() {
+ics_api_a1_get_type() {
__log_test_start $@
if [ $# -lt 2 ] || [ $# -gt 3 ]; then
@@ -577,7 +577,7 @@
fi
query="/A1-EI/v1/eitypes/$2"
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -614,7 +614,7 @@
# API Test function: GET /A1-EI/v1/eitypes
# args: <response-code> [ (EMPTY | [<type-id>]+) ]
# (Function for test scripts)
-ecs_api_a1_get_type_ids() {
+ics_api_a1_get_type_ids() {
__log_test_start $@
if [ $# -lt 1 ]; then
@@ -623,7 +623,7 @@
fi
query="/A1-EI/v1/eitypes"
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -659,7 +659,7 @@
# args: <response-code> <type-id> <job-id> [<status>]
# args (flat uri structure): <response-code> <job-id> [<status> [<timeout>]]
# (Function for test scripts)
-ecs_api_a1_get_job_status() {
+ics_api_a1_get_job_status() {
__log_test_start $@
if [ -z "$FLAT_A1_EI" ]; then
@@ -670,7 +670,7 @@
query="/A1-EI/v1/eitypes/$2/eijobs/$3/status"
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -699,7 +699,7 @@
start=$SECONDS
for (( ; ; )); do
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $# -eq 4 ]; then
@@ -754,7 +754,7 @@
# args: <response-code> <type-id> <job-id> [<target-url> <owner-id> <template-job-file>]
# args (flat uri structure): <response-code> <job-id> [<type-id> <target-url> <owner-id> <template-job-file>]
# (Function for test scripts)
-ecs_api_a1_get_job() {
+ics_api_a1_get_job() {
__log_test_start $@
if [ -z "$FLAT_A1_EI" ]; then
@@ -771,7 +771,7 @@
fi
query="/A1-EI/v1/eijobs/$2"
fi
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -829,7 +829,7 @@
# args: <response-code> <type-id> <job-id>
# args (flat uri structure): <response-code> <job-id>
# (Function for test scripts)
-ecs_api_a1_delete_job() {
+ics_api_a1_delete_job() {
__log_test_start $@
if [ -z "$FLAT_A1_EI" ]; then
@@ -847,7 +847,7 @@
fi
query="/A1-EI/v1/eijobs/$2"
fi
- res="$(__do_curl_to_api ECS DELETE $query)"
+ res="$(__do_curl_to_api ICS DELETE $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -863,7 +863,7 @@
# args: <response-code> <type-id> <job-id> <target-url> <owner-id> <template-job-file>
# args (flat uri structure): <response-code> <job-id> <type-id> <target-url> <owner-id> <notification-url> <template-job-file>
# (Function for test scripts)
-ecs_api_a1_put_job() {
+ics_api_a1_put_job() {
__log_test_start $@
if [ -z "$FLAT_A1_EI" ]; then
@@ -905,7 +905,7 @@
query="/A1-EI/v1/eijobs/$2"
fi
- res="$(__do_curl_to_api ECS PUT $query $file)"
+ res="$(__do_curl_to_api ICS PUT $query $file)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -919,27 +919,27 @@
##########################################
-#### Enrichment Data Producer API ####
+#### information Data Producer API ####
##########################################
-# Function prefix: ecs_api_edp
+# Function prefix: ics_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() {
+ics_api_edp_get_type_ids() {
__log_test_start $@
if [ $# -lt 1 ]; then
__print_err "<response-code> [ EMPTY | <type-id>+]" $@
return 1
fi
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ if [[ "$ICS_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)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -976,21 +976,21 @@
# 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() {
+ics_api_edp_get_producer_status() {
__log_test_start $@
if [ $# -lt 2 ] || [ $# -gt 4 ]; then
__print_err "<response-code> <producer-id> [<status> [<timeout>]]" $@
return 1
fi
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ if [[ "$ICS_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)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $# -eq 4 ]; then
@@ -1041,7 +1041,7 @@
# API Test function: GET /ei-producer/v1/eiproducers
# args (v1_1): <response-code> [ EMPTY | <producer-id>+]
# (Function for test scripts)
-ecs_api_edp_get_producer_ids() {
+ics_api_edp_get_producer_ids() {
__log_test_start $@
if [ $# -lt 1 ]; then
@@ -1050,7 +1050,7 @@
fi
query="/ei-producer/v1/eiproducers"
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1089,14 +1089,14 @@
# 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() {
+ics_api_edp_get_producer_ids_2() {
__log_test_start $@
if [ $# -lt 1 ]; then
__print_err "<response-code> [ ( NOTYPE | <type-id> ) [ EMPTY | <producer-id>+] ]" $@
return 1
fi
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
query="/data-producer/v1/info-producers"
if [ $# -gt 1 ] && [ $2 != "NOTYPE" ]; then
query=$query"?info_type_id=$2"
@@ -1107,7 +1107,7 @@
query=$query"?ei_type_id=$2"
fi
fi
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1145,7 +1145,7 @@
# API Test function: GET /ei-producer/v1/eitypes/{eiTypeId}
# args: (v1_1) <response-code> <type-id> [<job-schema-file> (EMPTY | [<producer-id>]+)]
# (Function for test scripts)
-ecs_api_edp_get_type() {
+ics_api_edp_get_type() {
__log_test_start $@
paramError=1
@@ -1161,7 +1161,7 @@
fi
query="/ei-producer/v1/eitypes/$2"
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1205,7 +1205,7 @@
# API Test function: GET /data-producer/v1/info-types/{infoTypeId}
# args: (v1_2) <response-code> <type-id> [<job-schema-file> [ <info-type-info> ]]
# (Function for test scripts)
-ecs_api_edp_get_type_2() {
+ics_api_edp_get_type_2() {
__log_test_start $@
paramError=1
@@ -1215,7 +1215,7 @@
if [ $# -eq 3 ]; then
paramError=0
fi
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then
+ if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then
if [ $# -eq 4 ]; then
paramError=0
fi
@@ -1224,13 +1224,13 @@
__print_err "<response-code> <type-id> [<job-schema-file> [ <info-type-info> ]]" $@
return 1
fi
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ if [[ "$ICS_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 GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1256,7 +1256,7 @@
fi
info_data=",\"info_type_information\":$info_data"
fi
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
targetJson="{\"info_job_data_schema\":$schema $info_data}"
else
targetJson="{\"ei_job_data_schema\":$schema}"
@@ -1278,10 +1278,10 @@
# API Test function: PUT /data-producer/v1/info-types/{infoTypeId}
# args: (v1_2) <response-code> <type-id> <job-schema-file> [ <info-type-info> ]
# (Function for test scripts)
-ecs_api_edp_put_type_2() {
+ics_api_edp_put_type_2() {
__log_test_start $@
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then
+ if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPE-INFO"* ]]; then
if [ $# -lt 3 ] || [ $# -gt 4 ]; then
__print_err "<response-code> <type-id> <job-schema-file> [ <info-type-info> ]" $@
return 1
@@ -1309,7 +1309,7 @@
info_data=",\"info_type_information\":$info_data"
fi
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
schema=$(cat $3)
input_json="{\"info_job_data_schema\":$schema $info_data}"
file="./tmp/put_type.json"
@@ -1324,7 +1324,7 @@
query="/ei-producer/v1/eitypes/$2"
fi
- res="$(__do_curl_to_api ECS PUT $query $file)"
+ res="$(__do_curl_to_api ICS PUT $query $file)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1340,7 +1340,7 @@
# 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() {
+ics_api_edp_delete_type_2() {
__log_test_start $@
if [ $# -ne 2 ]; then
@@ -1348,12 +1348,12 @@
return 1
fi
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ if [[ "$ICS_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)"
+ res="$(__do_curl_to_api ICS DELETE $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1368,7 +1368,7 @@
# API Test function: GET /ei-producer/v1/eiproducers/{eiProducerId}
# args: (v1_1) <response-code> <producer-id> [<job-callback> <supervision-callback> (EMPTY | [<type-id> <schema-file>]+) ]
# (Function for test scripts)
-ecs_api_edp_get_producer() {
+ics_api_edp_get_producer() {
__log_test_start $@
#Possible arg count: 2, 5 6, 8, 10 etc
@@ -1390,7 +1390,7 @@
fi
query="/ei-producer/v1/eiproducers/$2"
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1438,7 +1438,7 @@
# 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() {
+ics_api_edp_get_producer_2() {
__log_test_start $@
#Possible arg count: 2, 5, 6, 7, 8 etc
@@ -1457,12 +1457,12 @@
__print_err "<response-code> <producer-id> [<job-callback> <supervision-callback> (EMPTY | <type-id>+) ]" $@
return 1
fi
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ if [[ "$ICS_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)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1484,7 +1484,7 @@
fi
targetJson=$targetJson"]"
if [ $# -gt 4 ]; then
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ if [[ "$ICS_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\"}"
@@ -1507,19 +1507,19 @@
# API Test function: DELETE /data-producer/v1/info-producers/{infoProducerId}
# args: <response-code> <producer-id>
# (Function for test scripts)
-ecs_api_edp_delete_producer() {
+ics_api_edp_delete_producer() {
__log_test_start $@
if [ $# -lt 2 ]; then
__print_err "<response-code> <producer-id>" $@
return 1
fi
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ if [[ "$ICS_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)"
+ res="$(__do_curl_to_api ICS DELETE $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1534,7 +1534,7 @@
# API Test function: PUT /ei-producer/v1/eiproducers/{eiProducerId}
# args: (v1_1) <response-code> <producer-id> <job-callback> <supervision-callback> NOTYPE|[<type-id> <schema-file>]+
# (Function for test scripts)
-ecs_api_edp_put_producer() {
+ics_api_edp_put_producer() {
__log_test_start $@
#Valid number of parametrer 5,6,8,10,
@@ -1574,7 +1574,7 @@
file="./tmp/.p.json"
echo "$inputJson" > $file
query="/ei-producer/v1/eiproducers/$2"
- res="$(__do_curl_to_api ECS PUT $query $file)"
+ res="$(__do_curl_to_api ICS PUT $query $file)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1590,7 +1590,7 @@
# 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() {
+ics_api_edp_put_producer_2() {
__log_test_start $@
#Valid number of parametrer 5,6,8,10,
@@ -1615,7 +1615,7 @@
inputJson=$inputJson"\""${arr[$i]}"\""
done
fi
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
inputJson="\"supported_info_types\":"$inputJson"]"
inputJson=$inputJson",\"info_job_callback_url\": \"$3\",\"info_producer_supervision_callback_url\": \"$4\""
@@ -1636,7 +1636,7 @@
echo "$inputJson" > $file
query="/ei-producer/v1/eiproducers/$2"
fi
- res="$(__do_curl_to_api ECS PUT $query $file)"
+ res="$(__do_curl_to_api ICS PUT $query $file)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1651,7 +1651,7 @@
# API Test function: GET /ei-producer/v1/eiproducers/{eiProducerId}/eijobs
# args: (V1-1) <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() {
+ics_api_edp_get_producer_jobs() {
__log_test_start $@
#Valid number of parameter 2,3,7,11
@@ -1672,7 +1672,7 @@
fi
query="/ei-producer/v1/eiproducers/$2/eijobs"
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
__log_test_fail_status_code $1 $status
@@ -1716,7 +1716,7 @@
# 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() {
+ics_api_edp_get_producer_jobs_2() {
__log_test_start $@
#Valid number of parameter 2,3,7,11
@@ -1735,12 +1735,12 @@
__print_err "<response-code> <producer-id> (EMPTY | [<job-id> <type-id> <target-url> <job-owner> <template-job-file>]+)" $@
return 1
fi
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ if [[ "$ICS_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)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
__log_test_fail_status_code $1 $status
@@ -1762,7 +1762,7 @@
__log_test_fail_general "Job template file "${arr[$i+4]}", does not exist"
return 1
fi
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ if [[ "$ICS_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\":\"????\"}"
@@ -1787,19 +1787,19 @@
##########################################
#### Service status ####
##########################################
-# Function prefix: ecs_api_service
+# Function prefix: ics_api_service
# API Test function: GET /status
# args: <response-code>
# (Function for test scripts)
-ecs_api_service_status() {
+ics_api_service_status() {
__log_test_start $@
if [ $# -lt 1 ]; then
__print_err "<response-code>" $@
return 1
fi
- res="$(__do_curl_to_api ECS GET /status)"
+ res="$(__do_curl_to_api ICS GET /status)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
__log_test_fail_status_code $1 $status
@@ -1812,13 +1812,13 @@
###########################################
######### Info data consumer API ##########
###########################################
-#Function prefix: ecs_api_idc
+#Function prefix: ics_api_idc
# API Test function: GET /data-consumer/v1/info-types
# args: <response-code> [ (EMPTY | [<type-id>]+) ]
# (Function for test scripts)
-ecs_api_idc_get_type_ids() {
+ics_api_idc_get_type_ids() {
__log_test_start $@
if [ $# -lt 1 ]; then
@@ -1827,7 +1827,7 @@
fi
query="/data-consumer/v1/info-types"
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1862,7 +1862,7 @@
# API Test function: GET /data-consumer/v1/info-jobs
# args: <response-code> <type-id>|NOTYPE <owner-id>|NOOWNER [ EMPTY | <job-id>+ ]
# (Function for test scripts)
-ecs_api_idc_get_job_ids() {
+ics_api_idc_get_job_ids() {
__log_test_start $@
# Valid number of parameters 4,5,6 etc
@@ -1884,7 +1884,7 @@
fi
query="/data-consumer/v1/info-jobs$search"
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1922,7 +1922,7 @@
# API Test function: GET /data-consumer/v1/info-jobs/{infoJobId}
# args: <response-code> <job-id> [<type-id> <target-url> <owner-id> <template-job-file>]
# (Function for test scripts)
-ecs_api_idc_get_job() {
+ics_api_idc_get_job() {
__log_test_start $@
if [ $# -ne 2 ] && [ $# -ne 7 ]; then
@@ -1930,7 +1930,7 @@
return 1
fi
query="/data-consumer/v1/info-jobs/$2"
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -1966,7 +1966,7 @@
# API Test function: PUT /data-consumer/v1/info-jobs/{infoJobId}
# args: <response-code> <job-id> <type-id> <target-url> <owner-id> <notification-url> <template-job-file> [ VALIDATE ]
# (Function for test scripts)
-ecs_api_idc_put_job() {
+ics_api_idc_put_job() {
__log_test_start $@
if [ $# -lt 7 ] || [ $# -gt 8 ]; then
@@ -1993,7 +1993,7 @@
fi
fi
- res="$(__do_curl_to_api ECS PUT $query $file)"
+ res="$(__do_curl_to_api ICS PUT $query $file)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -2008,7 +2008,7 @@
# API Test function: DELETE /data-consumer/v1/info-jobs/{infoJobId}
# args: <response-code> <job-id>
# (Function for test scripts)
-ecs_api_idc_delete_job() {
+ics_api_idc_delete_job() {
__log_test_start $@
if [ $# -ne 2 ]; then
@@ -2016,7 +2016,7 @@
return 1
fi
query="/data-consumer/v1/info-jobs/$2"
- res="$(__do_curl_to_api ECS DELETE $query)"
+ res="$(__do_curl_to_api ICS DELETE $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -2031,7 +2031,7 @@
# API Test function: GET /data-consumer/v1/info-types/{infoTypeId}
# args: <response-code> <type-id> [<schema-file> [<type-status> <producers-count]]
# (Function for test scripts)
-ecs_api_idc_get_type() {
+ics_api_idc_get_type() {
__log_test_start $@
if [ $# -lt 2 ] || [ $# -gt 5 ]; then
@@ -2040,7 +2040,7 @@
fi
query="/data-consumer/v1/info-types/$2"
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -2078,7 +2078,7 @@
# This test only status during an optional timeout. No test of the list of producers
# args: <response-code> <job-id> [<status> [<timeout>]]
# (Function for test scripts)
-ecs_api_idc_get_job_status() {
+ics_api_idc_get_job_status() {
__log_test_start $@
if [ $# -lt 2 ] && [ $# -gt 4 ]; then
@@ -2090,7 +2090,7 @@
start=$SECONDS
for (( ; ; )); do
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $# -eq 4 ]; then
@@ -2144,7 +2144,7 @@
# This function test status and the list of producers with and optional timeout
# args: <response-code> <job-id> [<status> EMPTYPROD|( <prod-count> <producer-id>+ ) [<timeout>]]
# (Function for test scripts)
-ecs_api_idc_get_job_status2() {
+ics_api_idc_get_job_status2() {
__log_test_start $@
param_error=0
@@ -2169,9 +2169,9 @@
idx=$(($4+4))
timeout=${args[$idx]}
fi
- for ((ecs_i = 0 ; ecs_i < $4 ; ecs_i++)); do
- idx=$(($ecs_i+4))
- if [ $ecs_i -gt 0 ]; then
+ for ((ics_i = 0 ; ics_i < $4 ; ics_i++)); do
+ idx=$(($ics_i+4))
+ if [ $ics_i -gt 0 ]; then
targetJson=$targetJson","
fi
targetJson=$targetJson"\""${args[$idx]}"\""
@@ -2189,7 +2189,7 @@
start=$SECONDS
for (( ; ; )); do
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $# -gt 2 ]; then
@@ -2245,7 +2245,7 @@
# API Test function: GET /data-consumer/v1/info-type-subscription
# args: <response-code> <owner-id>|NOOWNER [ EMPTY | <subscription-id>+]
# (Function for test scripts)
-ecs_api_idc_get_subscription_ids() {
+ics_api_idc_get_subscription_ids() {
__log_test_start $@
if [ $# -lt 3 ]; then
@@ -2259,7 +2259,7 @@
search="?owner="$2
fi
- res="$(__do_curl_to_api ECS GET $query$search)"
+ res="$(__do_curl_to_api ICS GET $query$search)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -2295,7 +2295,7 @@
# API Test function: GET /data-consumer/v1/info-type-subscription/{subscriptionId}
# args: <response-code> <subscription-id> [ <owner-id> <status-uri> ]
# (Function for test scripts)
-ecs_api_idc_get_subscription() {
+ics_api_idc_get_subscription() {
__log_test_start $@
if [ $# -ne 2 ] && [ $# -ne 4 ]; then
@@ -2304,7 +2304,7 @@
fi
query="/data-consumer/v1/info-type-subscription/$2"
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -2331,7 +2331,7 @@
# API Test function: PUT /data-consumer/v1/info-type-subscription/{subscriptionId}
# args: <response-code> <subscription-id> <owner-id> <status-uri>
# (Function for test scripts)
-ecs_api_idc_put_subscription() {
+ics_api_idc_put_subscription() {
__log_test_start $@
if [ $# -ne 4 ]; then
@@ -2344,7 +2344,7 @@
echo "$inputJson" > $file
query="/data-consumer/v1/info-type-subscription/$2"
- res="$(__do_curl_to_api ECS PUT $query $file)"
+ res="$(__do_curl_to_api ICS PUT $query $file)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -2359,7 +2359,7 @@
# API Test function: DELETE /data-consumer/v1/info-type-subscription/{subscriptionId}
# args: <response-code> <subscription-id>
# (Function for test scripts)
-ecs_api_idc_delete_subscription() {
+ics_api_idc_delete_subscription() {
__log_test_start $@
if [ $# -ne 2 ]; then
@@ -2368,7 +2368,7 @@
fi
query="/data-consumer/v1/info-type-subscription/$2"
- res="$(__do_curl_to_api ECS DELETE $query)"
+ res="$(__do_curl_to_api ICS DELETE $query)"
status=${res:${#res}-3}
if [ $status -ne $1 ]; then
@@ -2383,13 +2383,13 @@
##########################################
#### Reset jobs ####
##########################################
-# Function prefix: ecs_api_admin
+# Function prefix: ics_api_admin
# Admin to remove all jobs
# args: <response-code> [ <type> ]
# (Function for test scripts)
-ecs_api_admin_reset() {
+ics_api_admin_reset() {
__log_test_start $@
if [ -z "$FLAT_A1_EI" ]; then
@@ -2397,7 +2397,7 @@
else
query="/A1-EI/v1/eijobs"
fi
- res="$(__do_curl_to_api ECS GET $query)"
+ res="$(__do_curl_to_api ICS GET $query)"
status=${res:${#res}-3}
if [ $status -ne 200 ]; then
@@ -2417,7 +2417,7 @@
echo "Not supported for non-flat EI api"
else
query="/A1-EI/v1/eijobs/$job"
- res="$(__do_curl_to_api ECS DELETE $query)"
+ res="$(__do_curl_to_api ICS DELETE $query)"
status=${res:${#res}-3}
if [ $status -ne 204 ]; then
__log_test_fail_status_code $1 $status
@@ -2436,21 +2436,21 @@
##########################################
-# Admin reset to remove all data in ecs; jobs, producers etc
+# Admin reset to remove all data in ics; jobs, producers etc
# NOTE - only works in kubernetes and the pod should not be running
# args: -
# (Function for test scripts)
-ecs_kube_pvc_reset() {
+ics_kube_pvc_reset() {
__log_test_start $@
- pvc_name=$(kubectl get pvc -n $KUBE_NONRTRIC_NAMESPACE --no-headers -o custom-columns=":metadata.name" | grep enrichment)
+ pvc_name=$(kubectl get pvc -n $KUBE_NONRTRIC_NAMESPACE --no-headers -o custom-columns=":metadata.name" | grep information)
if [ -z "$pvc_name" ]; then
- pvc_name=enrichmentservice-pvc
+ pvc_name=informationservice-pvc
fi
echo " Trying to reset pvc: "$pvc_name
- __kube_clean_pvc $ECS_APP_NAME $KUBE_NONRTRIC_NAMESPACE $pvc_name $ECS_CONTAINER_MNT_DIR
+ __kube_clean_pvc $ICS_APP_NAME $KUBE_NONRTRIC_NAMESPACE $pvc_name $ICS_CONTAINER_MNT_DIR
__log_test_pass
return 0
diff --git a/test/common/mr_api_functions.sh b/test/common/mr_api_functions.sh
index c6feb45..55badb0 100755
--- a/test/common/mr_api_functions.sh
+++ b/test/common/mr_api_functions.sh
@@ -273,7 +273,7 @@
# args: <protocol> <internal-port> <external-port> <internal-secure-port> <external-secure-port>
__mr_set_protocoll() {
echo -e $BOLD"$MR_STUB_DISPLAY_NAME and $MR_DMAAP_DISPLAY_NAME protocol setting"$EBOLD
- echo -e " Using $BOLD http $EBOLD towards $MR_STUB_DISPLAY_NAME and $MR_DMAAP_DISPLAY_NAME"
+ echo -e " Using $BOLD $1 $EBOLD towards $MR_STUB_DISPLAY_NAME and $MR_DMAAP_DISPLAY_NAME"
## Access to Dmaap mediator
diff --git a/test/common/ngw_api_functions.sh b/test/common/ngw_api_functions.sh
index d8f1707..9e29278 100644
--- a/test/common/ngw_api_functions.sh
+++ b/test/common/ngw_api_functions.sh
@@ -128,7 +128,7 @@
# args: <protocol> <internal-port> <external-port>
__gateway_set_protocoll() {
echo -e $BOLD"$NRT_GATEWAY_DISPLAY_NAME protocol setting"$EBOLD
- echo -e " Using $BOLD http $EBOLD towards $NRT_GATEWAY_DISPLAY_NAME"
+ echo -e " Using $BOLD $1 $EBOLD towards $NRT_GATEWAY_DISPLAY_NAME"
## Access to nonrtric gateway
@@ -199,12 +199,12 @@
if [ $RUNMODE == "KUBE" ]; then
export POLICY_AGENT_EXTERNAL_SECURE_PORT
- export ECS_EXTERNAL_SECURE_PORT
+ export ICS_EXTERNAL_SECURE_PORT
export POLICY_AGENT_DOMAIN_NAME=$POLICY_AGENT_APP_NAME.$KUBE_NONRTRIC_NAMESPACE
- export ECS_DOMAIN_NAME=$ECS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE
+ export ICS_DOMAIN_NAME=$ICS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE
else
export POLICY_AGENT_DOMAIN_NAME=$POLICY_AGENT_APP_NAME
- export ECS_DOMAIN_NAME=$ECS_APP_NAME
+ export ICS_DOMAIN_NAME=$ICS_APP_NAME
fi
}
@@ -319,11 +319,11 @@
return 0
}
-# API Test function: GET /ei-producer/v1/eitypes towards ECS
+# API Test function: GET /ei-producer/v1/eitypes towards ICS
# Note: This is just to test service response
# args: <response-code>
# (Function for test scripts)
-gateway_ecs_get_types() {
+gateway_ics_get_types() {
__log_test_start $@
if [ $# -ne 1 ]; then
__print_err "<response-code>" $@
diff --git a/test/common/pa_api_functions.sh b/test/common/pa_api_functions.sh
index 219aedb..7c91705 100644
--- a/test/common/pa_api_functions.sh
+++ b/test/common/pa_api_functions.sh
@@ -149,7 +149,7 @@
# args: <protocol> <internal-port> <external-port>
__agent_set_protocoll() {
echo -e $BOLD"$POLICY_AGENT_DISPLAY_NAME protocol setting"$EBOLD
- echo -e " Using $BOLD http $EBOLD towards $POLICY_AGENT_DISPLAY_NAME"
+ echo -e " Using $BOLD $1 $EBOLD towards $POLICY_AGENT_DISPLAY_NAME"
## Access to Dmaap adapter
diff --git a/test/common/prodstub_api_functions.sh b/test/common/prodstub_api_functions.sh
index 17f987a..f792d69 100644
--- a/test/common/prodstub_api_functions.sh
+++ b/test/common/prodstub_api_functions.sh
@@ -139,7 +139,7 @@
# args: <protocol> <internal-port> <external-port>
__prod_stub_set_protocoll() {
echo -e $BOLD"$PROD_STUB_DISPLAY_NAME protocol setting"$EBOLD
- echo -e " Using $BOLD http $EBOLD towards $PROD_STUB_DISPLAY_NAME"
+ echo -e " Using $BOLD $1 $EBOLD towards $PROD_STUB_DISPLAY_NAME"
## Access to Prod stub sim
@@ -192,13 +192,13 @@
retcode_p=$?
if [ $retcode_i -ne 0 ] && [ $retcode_p -ne 0 ]; then
- echo -e $RED"The $ECS_APP_NAME app is not included as managed nor prestarted in this test script"$ERED
- echo -e $RED"The $ECS_APP_NAME will not be started"$ERED
+ echo -e $RED"The $ICS_APP_NAME app is not included as managed nor prestarted in this test script"$ERED
+ echo -e $RED"The $ICS_APP_NAME will not be started"$ERED
exit
fi
if [ $retcode_i -eq 0 ] && [ $retcode_p -eq 0 ]; then
- echo -e $RED"The $ECS_APP_NAME app is included both as managed and prestarted in this test script"$ERED
- echo -e $RED"The $ECS_APP_NAME will not be started"$ERED
+ echo -e $RED"The $ICS_APP_NAME app is included both as managed and prestarted in this test script"$ERED
+ echo -e $RED"The $ICS_APP_NAME will not be started"$ERED
exit
fi
@@ -438,7 +438,7 @@
__log_test_fail_general "Template file "$7" for jobdata, does not exist"
return 1
fi
- if [[ "$ECS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
+ if [[ "$ICS_FEATURE_LEVEL" == *"INFO-TYPES"* ]]; then
targetJson="{\"info_job_identity\":\"$3\",\"info_type_identity\":\"$4\",\"target_uri\":\"$5\",\"owner\":\"$6\", \"info_job_data\":$jobfile,\"last_updated\":\"????\"}"
else
targetJson="{\"ei_job_identity\":\"$3\",\"ei_type_identity\":\"$4\",\"target_uri\":\"$5\",\"owner\":\"$6\", \"ei_job_data\":$jobfile,\"last_updated\":\"????\"}"
diff --git a/test/common/rc_api_functions.sh b/test/common/rc_api_functions.sh
index 537bc0c..3766d19 100644
--- a/test/common/rc_api_functions.sh
+++ b/test/common/rc_api_functions.sh
@@ -116,7 +116,7 @@
# args: <protocol> <internal-port> <external-port>
__rapp_catalogue_set_protocoll() {
echo -e $BOLD"$RAPP_CAT_DISPLAY_NAME protocol setting"$EBOLD
- echo -e " Using $BOLD http $EBOLD towards $RAPP_CAT_DISPLAY_NAME"
+ echo -e " Using $BOLD $1 $EBOLD towards $RAPP_CAT_DISPLAY_NAME"
## Access to Rapp catalogue
@@ -234,7 +234,7 @@
#__var_test RC "$LOCALHOST_HTTP:$RC_EXTERNAL_PORT/" $1 "=" $2 $3
__var_test RC "$RC_SERVICE_PATH/" $1 "=" $2 $3
else
- __print_err "Wrong args to ecs_equal, needs two or three args: <sim-param> <target-value> [ timeout ]" $@
+ __print_err "Wrong args to ics_equal, needs two or three args: <sim-param> <target-value> [ timeout ]" $@
fi
}
diff --git a/test/common/sdnc_api_functions.sh b/test/common/sdnc_api_functions.sh
index b3ef07b..d502825 100644
--- a/test/common/sdnc_api_functions.sh
+++ b/test/common/sdnc_api_functions.sh
@@ -140,7 +140,7 @@
# args: <protocol> <internal-port> <external-port>
__sdnc_set_protocoll() {
echo -e $BOLD"$SDNC_DISPLAY_NAME protocol setting"$EBOLD
- echo -e " Using $BOLD http $EBOLD towards $SDNC_DISPLAY_NAME"
+ echo -e " Using $BOLD $1 $EBOLD towards $SDNC_DISPLAY_NAME"
## Access to SDNC
diff --git a/test/common/test_env-onap-honolulu.sh b/test/common/test_env-onap-honolulu.sh
index f82d54f..b312518 100755
--- a/test/common/test_env-onap-honolulu.sh
+++ b/test/common/test_env-onap-honolulu.sh
@@ -86,10 +86,10 @@
SDNC_DB_IMAGE_BASE="mariadb"
SDNC_DB_IMAGE_TAG_REMOTE_PROXY="10.5"
-# ECS image and tag - uses cherry release
-ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service"
-ECS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.1"
-#Note: Update var ECS_FEATURE_LEVEL if image version is changed
+# ICS image and tag - uses cherry release
+ICS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service"
+ICS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.0.1"
+#Note: Update var ICS_FEATURE_LEVEL if image version is changed
# Control Panel image and tag - uses cherry release
CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel"
@@ -170,7 +170,7 @@
PROJECT_IMAGES_APP_NAMES="PA SDNC"
# List of app short names which images pulled from ORAN
-ORAN_IMAGES_APP_NAMES="CP ECS RICSIM RC"
+ORAN_IMAGES_APP_NAMES="CP ICS RICSIM RC"
# List of app short names which images pulled from ONAP
ONAP_IMAGES_APP_NAMES="" # Not used
@@ -213,25 +213,25 @@
POLICY_AGENT_DATA_FILE="application_configuration.json" # Container data file name
POLICY_AGENT_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container
-ECS_APP_NAME="enrichmentservice" # Name for ECS container
-ECS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ECS container
-ECS_EXTERNAL_PORT=8083 # ECS container external port (host -> container)
-ECS_INTERNAL_PORT=8083 # ECS container internal port (container -> container)
-ECS_EXTERNAL_SECURE_PORT=8434 # ECS container external secure port (host -> container)
-ECS_INTERNAL_SECURE_PORT=8434 # ECS container internal secure port (container -> container)
+ICS_APP_NAME="informationservice" # Name for ICS container
+ICS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ICS container
+ICS_EXTERNAL_PORT=8083 # ICS container external port (host -> container)
+ICS_INTERNAL_PORT=8083 # ICS container internal port (container -> container)
+ICS_EXTERNAL_SECURE_PORT=8434 # ICS container external secure port (host -> container)
+ICS_INTERNAL_SECURE_PORT=8434 # ICS container internal secure port (container -> container)
-ECS_LOGPATH="/var/log/enrichment-coordinator-service/application.log" # Path the application log in the ECS container
-ECS_APP_NAME_ALIAS="enrichment-service-container" # Alias name, name used by the control panel
-ECS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host
-ECS_CONTAINER_MNT_DIR="/var/enrichment-coordinator-service" # Mounted dir in the container
-ECS_ACTUATOR="/actuator/loggers/org.oransc.enrichment" # Url for trace/debug
-ECS_CERT_MOUNT_DIR="./cert"
-ECS_ALIVE_URL="/status" # Base path for alive check
-ECS_COMPOSE_DIR="ecs" # Dir in simulator_group for docker-compose
-ECS_CONFIG_MOUNT_PATH=/opt/app/enrichment-coordinator-service/config # Internal container path for configuration
-ECS_CONFIG_FILE=application.yaml # Config file name
-ECS_VERSION="V1-2" # Version where the types are added in the producer registration
-ECS_FEATURE_LEVEL="" # Space separated list of features
+ICS_LOGPATH="/var/log/information-coordinator-service/application.log" # Path the application log in the ICS container
+ICS_APP_NAME_ALIAS="information-service-container" # Alias name, name used by the control panel
+ICS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host
+ICS_CONTAINER_MNT_DIR="/var/information-coordinator-service" # Mounted dir in the container
+ICS_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug
+ICS_CERT_MOUNT_DIR="./cert"
+ICS_ALIVE_URL="/status" # Base path for alive check
+ICS_COMPOSE_DIR="ics" # Dir in simulator_group for docker-compose
+ICS_CONFIG_MOUNT_PATH=/opt/app/information-coordinator-service/config # Internal container path for configuration
+ICS_CONFIG_FILE=application.yaml # Config file name
+ICS_VERSION="V1-2" # Version where the types are added in the producer registration
+ICS_FEATURE_LEVEL="" # Space separated list of features
MR_DMAAP_APP_NAME="message-router" # Name for the Dmaap MR
MR_STUB_APP_NAME="mr-stub" # Name of the MR stub
diff --git a/test/common/test_env-onap-istanbul.sh b/test/common/test_env-onap-istanbul.sh
index b2b0d2e..a8d1b0a 100644
--- a/test/common/test_env-onap-istanbul.sh
+++ b/test/common/test_env-onap-istanbul.sh
@@ -86,10 +86,10 @@
SDNC_DB_IMAGE_BASE="mariadb"
SDNC_DB_IMAGE_TAG_REMOTE_PROXY="10.5"
-# ECS image and tag - uses d release
-ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service"
-ECS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.1.0"
-#Note: Update var ECS_FEATURE_LEVEL if image version is changed
+# ICS image and tag - uses d release
+ICS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service"
+ICS_IMAGE_TAG_REMOTE_RELEASE_ORAN="1.1.0"
+#Note: Update var ICS_FEATURE_LEVEL if image version is changed
# Control Panel image and tag - uses d release
CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel"
@@ -173,7 +173,7 @@
PROJECT_IMAGES_APP_NAMES="PA SDNC"
# List of app short names which images pulled from ORAN
-ORAN_IMAGES_APP_NAMES="CP ECS RICSIM RC NGW"
+ORAN_IMAGES_APP_NAMES="CP ICS RICSIM RC NGW"
# List of app short names which images pulled from ONAP
ONAP_IMAGES_APP_NAMES="" # Not used
@@ -216,25 +216,25 @@
POLICY_AGENT_DATA_FILE="application_configuration.json" # Container data file name
POLICY_AGENT_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container
-ECS_APP_NAME="enrichmentservice" # Name for ECS container
-ECS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ECS container
-ECS_EXTERNAL_PORT=8083 # ECS container external port (host -> container)
-ECS_INTERNAL_PORT=8083 # ECS container internal port (container -> container)
-ECS_EXTERNAL_SECURE_PORT=8434 # ECS container external secure port (host -> container)
-ECS_INTERNAL_SECURE_PORT=8434 # ECS container internal secure port (container -> container)
+ICS_APP_NAME="informationservice" # Name for ICS container
+ICS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ICS container
+ICS_EXTERNAL_PORT=8083 # ICS container external port (host -> container)
+ICS_INTERNAL_PORT=8083 # ICS container internal port (container -> container)
+ICS_EXTERNAL_SECURE_PORT=8434 # ICS container external secure port (host -> container)
+ICS_INTERNAL_SECURE_PORT=8434 # ICS container internal secure port (container -> container)
-ECS_LOGPATH="/var/log/enrichment-coordinator-service/application.log" # Path the application log in the ECS container
-ECS_APP_NAME_ALIAS="enrichment-service-container" # Alias name, name used by the control panel
-ECS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host
-ECS_CONTAINER_MNT_DIR="/var/enrichment-coordinator-service" # Mounted dir in the container
-ECS_ACTUATOR="/actuator/loggers/org.oransc.enrichment" # Url for trace/debug
-ECS_CERT_MOUNT_DIR="./cert"
-ECS_ALIVE_URL="/status" # Base path for alive check
-ECS_COMPOSE_DIR="ecs" # Dir in simulator_group for docker-compose
-ECS_CONFIG_MOUNT_PATH=/opt/app/enrichment-coordinator-service/config # Internal container path for configuration
-ECS_CONFIG_FILE=application.yaml # Config file name
-ECS_VERSION="V1-2" # Version where the types are added in the producer registration
-ECS_FEATURE_LEVEL="INFO-TYPES" # Space separated list of features
+ICS_LOGPATH="/var/log/information-coordinator-service/application.log" # Path the application log in the ICS container
+ICS_APP_NAME_ALIAS="information-service-container" # Alias name, name used by the control panel
+ICS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host
+ICS_CONTAINER_MNT_DIR="/var/information-coordinator-service" # Mounted dir in the container
+ICS_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug
+ICS_CERT_MOUNT_DIR="./cert"
+ICS_ALIVE_URL="/status" # Base path for alive check
+ICS_COMPOSE_DIR="ics" # Dir in simulator_group for docker-compose
+ICS_CONFIG_MOUNT_PATH=/opt/app/information-coordinator-service/config # Internal container path for configuration
+ICS_CONFIG_FILE=application.yaml # Config file name
+ICS_VERSION="V1-2" # Version where the types are added in the producer registration
+ICS_FEATURE_LEVEL="INFO-TYPES" # Space separated list of features
MR_DMAAP_APP_NAME="message-router" # Name for the Dmaap MR
MR_STUB_APP_NAME="mr-stub" # Name of the MR stub
diff --git a/test/common/test_env-oran-cherry.sh b/test/common/test_env-oran-cherry.sh
index b1204cc..6abb133 100755
--- a/test/common/test_env-oran-cherry.sh
+++ b/test/common/test_env-oran-cherry.sh
@@ -65,12 +65,12 @@
POLICY_AGENT_IMAGE_TAG_REMOTE="2.1.1"
POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.1.1"
-# ECS image and tags
-ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service"
-ECS_IMAGE_TAG_LOCAL="1.0.1-SNAPSHOT"
-ECS_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.1-SNAPSHOT"
-ECS_IMAGE_TAG_REMOTE="1.0.1"
-ECS_IMAGE_TAG_REMOTE_RELEASE="1.0.1"
+# ICS image and tags
+ICS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service"
+ICS_IMAGE_TAG_LOCAL="1.0.1-SNAPSHOT"
+ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.0.1-SNAPSHOT"
+ICS_IMAGE_TAG_REMOTE="1.0.1"
+ICS_IMAGE_TAG_REMOTE_RELEASE="1.0.1"
# Control Panel image and tags
@@ -171,7 +171,7 @@
#No local image for pvc cleaner, remote image always used
# List of app short names produced by the project
-PROJECT_IMAGES_APP_NAMES="PA ECS CP SDNC RC RICSIM"
+PROJECT_IMAGES_APP_NAMES="PA ICS CP SDNC RC RICSIM"
# List of app short names which images pulled from ORAN
ORAN_IMAGES_APP_NAMES="" # Not used
@@ -216,25 +216,25 @@
POLICY_AGENT_DATA_FILE="application_configuration.json" # Container data file name
POLICY_AGENT_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container
-ECS_APP_NAME="enrichmentservice" # Name for ECS container
-ECS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ECS container
-ECS_EXTERNAL_PORT=8083 # ECS container external port (host -> container)
-ECS_INTERNAL_PORT=8083 # ECS container internal port (container -> container)
-ECS_EXTERNAL_SECURE_PORT=8434 # ECS container external secure port (host -> container)
-ECS_INTERNAL_SECURE_PORT=8434 # ECS container internal secure port (container -> container)
+ICS_APP_NAME="informationservice" # Name for ICS container
+ICS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ICS container
+ICS_EXTERNAL_PORT=8083 # ICS container external port (host -> container)
+ICS_INTERNAL_PORT=8083 # ICS container internal port (container -> container)
+ICS_EXTERNAL_SECURE_PORT=8434 # ICS container external secure port (host -> container)
+ICS_INTERNAL_SECURE_PORT=8434 # ICS container internal secure port (container -> container)
-ECS_LOGPATH="/var/log/enrichment-coordinator-service/application.log" # Path the application log in the ECS container
-ECS_APP_NAME_ALIAS="enrichment-service-container" # Alias name, name used by the control panel
-ECS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host
-ECS_CONTAINER_MNT_DIR="/var/enrichment-coordinator-service" # Mounted dir in the container
-ECS_ACTUATOR="/actuator/loggers/org.oransc.enrichment" # Url for trace/debug
-ECS_CERT_MOUNT_DIR="./cert"
-ECS_ALIVE_URL="/status" # Base path for alive check
-ECS_COMPOSE_DIR="ecs" # Dir in simulator_group for docker-compose
-ECS_CONFIG_MOUNT_PATH=/opt/app/enrichment-coordinator-service/config # Internal container path for configuration
-ECS_CONFIG_FILE=application.yaml # Config file name
-ECS_VERSION="V1-2" # Version where the types are added in the producer registration
-ECS_FEATURE_LEVEL="" # Space separated list of features
+ICS_LOGPATH="/var/log/information-coordinator-service/application.log" # Path the application log in the ICS container
+ICS_APP_NAME_ALIAS="information-service-container" # Alias name, name used by the control panel
+ICS_HOST_MNT_DIR="./mnt" # Mounted dir, relative to compose file, on the host
+ICS_CONTAINER_MNT_DIR="/var/information-coordinator-service" # Mounted dir in the container
+ICS_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug
+ICS_CERT_MOUNT_DIR="./cert"
+ICS_ALIVE_URL="/status" # Base path for alive check
+ICS_COMPOSE_DIR="ics" # Dir in simulator_group for docker-compose
+ICS_CONFIG_MOUNT_PATH=/opt/app/information-coordinator-service/config # Internal container path for configuration
+ICS_CONFIG_FILE=application.yaml # Config file name
+ICS_VERSION="V1-2" # Version where the types are added in the producer registration
+ICS_FEATURE_LEVEL="" # Space separated list of features
MR_DMAAP_APP_NAME="message-router" # Name for the Dmaap MR
MR_STUB_APP_NAME="mr-stub" # Name of the MR stub
diff --git a/test/common/test_env-oran-d-release.sh b/test/common/test_env-oran-d-release.sh
index cde9849..ed7670e 100755
--- a/test/common/test_env-oran-d-release.sh
+++ b/test/common/test_env-oran-d-release.sh
@@ -65,13 +65,13 @@
POLICY_AGENT_IMAGE_TAG_REMOTE="2.2.1"
POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.2.1"
-# ECS image and tags
-ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service"
-ECS_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT"
-ECS_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT"
-ECS_IMAGE_TAG_REMOTE="1.1.0"
-ECS_IMAGE_TAG_REMOTE_RELEASE="1.1.0"
-#Note: Update var ECS_FEATURE_LEVEL if image version is changed
+# ICS image and tags
+ICS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service"
+ICS_IMAGE_TAG_LOCAL="1.1.0-SNAPSHOT"
+ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.1.0-SNAPSHOT"
+ICS_IMAGE_TAG_REMOTE="1.1.0"
+ICS_IMAGE_TAG_REMOTE_RELEASE="1.1.0"
+#Note: Update var ICS_FEATURE_LEVEL if image version is changed
#Control Panel image and tags
CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel"
@@ -190,7 +190,7 @@
#No local image for pvc cleaner, remote image always used
# List of app short names produced by the project
-PROJECT_IMAGES_APP_NAMES="PA ECS CP RC RICSIM NGW" # Add SDNC here if oran image is used
+PROJECT_IMAGES_APP_NAMES="PA ICS CP RC RICSIM NGW" # Add SDNC here if oran image is used
# List of app short names which images pulled from ORAN
ORAN_IMAGES_APP_NAMES="" # Not used
@@ -235,25 +235,25 @@
POLICY_AGENT_DATA_FILE="application_configuration.json" # Container data file name
POLICY_AGENT_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container
-ECS_APP_NAME="enrichmentservice" # Name for ECS container
-ECS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ECS container
-ECS_EXTERNAL_PORT=8083 # ECS container external port (host -> container)
-ECS_INTERNAL_PORT=8083 # ECS container internal port (container -> container)
-ECS_EXTERNAL_SECURE_PORT=8434 # ECS container external secure port (host -> container)
-ECS_INTERNAL_SECURE_PORT=8434 # ECS container internal secure port (container -> container)
+ICS_APP_NAME="informationservice" # Name for ICS container
+ICS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ICS container
+ICS_EXTERNAL_PORT=8083 # ICS container external port (host -> container)
+ICS_INTERNAL_PORT=8083 # ICS container internal port (container -> container)
+ICS_EXTERNAL_SECURE_PORT=8434 # ICS container external secure port (host -> container)
+ICS_INTERNAL_SECURE_PORT=8434 # ICS container internal secure port (container -> container)
-ECS_LOGPATH="/var/log/enrichment-coordinator-service/application.log" # Path the application log in the ECS container
-ECS_APP_NAME_ALIAS="enrichment-service-container" # Alias name, name used by the control panel
-ECS_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host
-ECS_CONTAINER_MNT_DIR="/var/enrichment-coordinator-service" # Mounted dir in the container
-ECS_ACTUATOR="/actuator/loggers/org.oransc.enrichment" # Url for trace/debug
-ECS_CERT_MOUNT_DIR="./cert"
-ECS_ALIVE_URL="/status" # Base path for alive check
-ECS_COMPOSE_DIR="ecs" # Dir in simulator_group for docker-compose
-ECS_CONFIG_MOUNT_PATH=/opt/app/enrichment-coordinator-service/config # Internal container path for configuration
-ECS_CONFIG_FILE=application.yaml # Config file name
-ECS_VERSION="V1-2" # Version where the types are decoupled from the producer registration
-ECS_FEATURE_LEVEL="INFO-TYPES" # Space separated list of features
+ICS_LOGPATH="/var/log/information-coordinator-service/application.log" # Path the application log in the ICS container
+ICS_APP_NAME_ALIAS="information-service-container" # Alias name, name used by the control panel
+ICS_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host
+ICS_CONTAINER_MNT_DIR="/var/information-coordinator-service" # Mounted dir in the container
+ICS_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug
+ICS_CERT_MOUNT_DIR="./cert"
+ICS_ALIVE_URL="/status" # Base path for alive check
+ICS_COMPOSE_DIR="ics" # Dir in simulator_group for docker-compose
+ICS_CONFIG_MOUNT_PATH=/opt/app/information-coordinator-service/config # Internal container path for configuration
+ICS_CONFIG_FILE=application.yaml # Config file name
+ICS_VERSION="V1-2" # Version where the types are decoupled from the producer registration
+ICS_FEATURE_LEVEL="INFO-TYPES" # Space separated list of features
MR_DMAAP_APP_NAME="message-router" # Name for the Dmaap MR
MR_STUB_APP_NAME="mr-stub" # Name of the MR stub
@@ -403,8 +403,8 @@
CONTROL_PANEL_NGINX_KUBE_RESOLVER="kube-dns.kube-system.svc.cluster.local valid=5s" #nginx resolver for kube
CONTROL_PANEL_NGINX_DOCKER_RESOLVER="127.0.0.11" # nginx resolver for docker
CONTROL_PANEL_PATH_POLICY_PREFIX="/a1-policy/" # Path prefix for forwarding policy calls to NGW
-CONTROL_PANEL_PATH_ECS_PREFIX="/data-producer/" # Path prefix for forwarding ecs calls to NGW
-CONTROL_PANEL_PATH_ECS_PREFIX2="/data-consumer/" # Path prefix for forwarding ecs calls to NGW
+CONTROL_PANEL_PATH_ICS_PREFIX="/data-producer/" # Path prefix for forwarding ics calls to NGW
+CONTROL_PANEL_PATH_ICS_PREFIX2="/data-consumer/" # Path prefix for forwarding ics calls to NGW
NRT_GATEWAY_APP_NAME="nonrtricgateway" # Name of the Gateway container
NRT_GATEWAY_DISPLAY_NAME="NonRT-RIC Gateway"
diff --git a/test/common/test_env-oran-e-release.sh b/test/common/test_env-oran-e-release.sh
index cd0d040..1003ddd 100755
--- a/test/common/test_env-oran-e-release.sh
+++ b/test/common/test_env-oran-e-release.sh
@@ -65,13 +65,13 @@
POLICY_AGENT_IMAGE_TAG_REMOTE="2.3.0"
POLICY_AGENT_IMAGE_TAG_REMOTE_RELEASE="2.3.0"
-# ECS image and tags
-ECS_IMAGE_BASE="o-ran-sc/nonrtric-enrichment-coordinator-service"
-ECS_IMAGE_TAG_LOCAL="1.2.0-SNAPSHOT"
-ECS_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.0-SNAPSHOT"
-ECS_IMAGE_TAG_REMOTE="1.2.0"
-ECS_IMAGE_TAG_REMOTE_RELEASE="1.2.0"
-#Note: Update var ECS_FEATURE_LEVEL if image version is changed
+# ICS image and tags
+ICS_IMAGE_BASE="o-ran-sc/nonrtric-information-coordinator-service"
+ICS_IMAGE_TAG_LOCAL="1.2.0-SNAPSHOT"
+ICS_IMAGE_TAG_REMOTE_SNAPSHOT="1.2.0-SNAPSHOT"
+ICS_IMAGE_TAG_REMOTE="1.2.0"
+ICS_IMAGE_TAG_REMOTE_RELEASE="1.2.0"
+#Note: Update var ICS_FEATURE_LEVEL if image version is changed
#Control Panel image and tags
CONTROL_PANEL_IMAGE_BASE="o-ran-sc/nonrtric-controlpanel"
@@ -203,7 +203,7 @@
#No local image for pvc cleaner, remote image always used
# List of app short names produced by the project
-PROJECT_IMAGES_APP_NAMES="PA ECS CP RC RICSIM NGW DMAAPADP DMAAPMED" # Add SDNC here if oran image is used
+PROJECT_IMAGES_APP_NAMES="PA ICS CP RC RICSIM NGW DMAAPADP DMAAPMED" # Add SDNC here if oran image is used
# List of app short names which images pulled from ORAN
ORAN_IMAGES_APP_NAMES="" # Not used
@@ -261,25 +261,25 @@
POLICY_AGENT_DATA_FILE="application_configuration.json" # Container data file name
POLICY_AGENT_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container
-ECS_APP_NAME="enrichmentservice" # Name for ECS container
-ECS_DISPLAY_NAME="Enrichment Coordinator Service" # Display name for ECS container
-ECS_EXTERNAL_PORT=8083 # ECS container external port (host -> container)
-ECS_INTERNAL_PORT=8083 # ECS container internal port (container -> container)
-ECS_EXTERNAL_SECURE_PORT=8434 # ECS container external secure port (host -> container)
-ECS_INTERNAL_SECURE_PORT=8434 # ECS container internal secure port (container -> container)
+ICS_APP_NAME="informationservice" # Name for ICS container
+ICS_DISPLAY_NAME="Information Coordinator Service" # Display name for ICS container
+ICS_EXTERNAL_PORT=8083 # ICS container external port (host -> container)
+ICS_INTERNAL_PORT=8083 # ICS container internal port (container -> container)
+ICS_EXTERNAL_SECURE_PORT=8434 # ICS container external secure port (host -> container)
+ICS_INTERNAL_SECURE_PORT=8434 # ICS container internal secure port (container -> container)
-ECS_LOGPATH="/var/log/enrichment-coordinator-service/application.log" # Path the application log in the ECS container
-ECS_APP_NAME_ALIAS="enrichment-service-container" # Alias name, name used by the control panel
-ECS_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host
-ECS_CONTAINER_MNT_DIR="/var/enrichment-coordinator-service" # Mounted dir in the container
-ECS_ACTUATOR="/actuator/loggers/org.oransc.enrichment" # Url for trace/debug
-ECS_CERT_MOUNT_DIR="./cert"
-ECS_ALIVE_URL="/status" # Base path for alive check
-ECS_COMPOSE_DIR="ecs" # Dir in simulator_group for docker-compose
-ECS_CONFIG_MOUNT_PATH=/opt/app/enrichment-coordinator-service/config # Internal container path for configuration
-ECS_CONFIG_FILE=application.yaml # Config file name
-ECS_VERSION="V1-2" # Version where the types are decoupled from the producer registration
-ECS_FEATURE_LEVEL="INFO-TYPES TYPE-SUBSCRIPTIONS INFO-TYPE-INFO" # Space separated list of features
+ICS_LOGPATH="/var/log/information-coordinator-service/application.log" # Path the application log in the ICS container
+ICS_APP_NAME_ALIAS="information-service-container" # Alias name, name used by the control panel
+ICS_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host
+ICS_CONTAINER_MNT_DIR="/var/information-coordinator-service" # Mounted dir in the container
+ICS_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug
+ICS_CERT_MOUNT_DIR="./cert"
+ICS_ALIVE_URL="/status" # Base path for alive check
+ICS_COMPOSE_DIR="ics" # Dir in simulator_group for docker-compose
+ICS_CONFIG_MOUNT_PATH=/opt/app/information-coordinator-service/config # Internal container path for configuration
+ICS_CONFIG_FILE=application.yaml # Config file name
+ICS_VERSION="V1-2" # Version where the types are decoupled from the producer registration
+ICS_FEATURE_LEVEL="INFO-TYPES TYPE-SUBSCRIPTIONS INFO-TYPE-INFO RESP_CODE_CHANGE_1" # Space separated list of features
MR_DMAAP_APP_NAME="message-router" # Name for the Dmaap MR
MR_STUB_APP_NAME="mr-stub" # Name of the MR stub
@@ -429,8 +429,8 @@
CONTROL_PANEL_NGINX_KUBE_RESOLVER="kube-dns.kube-system.svc.cluster.local valid=5s" #nginx resolver for kube
CONTROL_PANEL_NGINX_DOCKER_RESOLVER="127.0.0.11" # nginx resolver for docker
CONTROL_PANEL_PATH_POLICY_PREFIX="/a1-policy/" # Path prefix for forwarding policy calls to NGW
-CONTROL_PANEL_PATH_ECS_PREFIX="/data-producer/" # Path prefix for forwarding ecs calls to NGW
-CONTROL_PANEL_PATH_ECS_PREFIX2="/data-consumer/" # Path prefix for forwarding ecs calls to NGW
+CONTROL_PANEL_PATH_ICS_PREFIX="/data-producer/" # Path prefix for forwarding ics calls to NGW
+CONTROL_PANEL_PATH_ICS_PREFIX2="/data-consumer/" # Path prefix for forwarding ics calls to NGW
NRT_GATEWAY_APP_NAME="nonrtricgateway" # Name of the Gateway container
NRT_GATEWAY_DISPLAY_NAME="NonRT-RIC Gateway"
@@ -516,7 +516,7 @@
DMAAP_MED_LOGPATH="/var/log/dmaap-adaptor-service/application.log" # Path the application log in the Dmaap Mediator container
DMAAP_MED_HOST_MNT_DIR="./mnt" # Mounted db dir, relative to compose file, on the host
#MAAP_ADP_CONTAINER_MNT_DIR="/var/dmaap-adaptor-service" # Mounted dir in the container
-#DMAAP_MED_ACTUATOR="/actuator/loggers/org.oransc.enrichment" # Url for trace/debug
+#DMAAP_MED_ACTUATOR="/actuator/loggers/org.oransc.information" # Url for trace/debug
#DMAAP_MED_CERT_MOUNT_DIR="./cert"
DMAAP_MED_ALIVE_URL="/status" # Base path for alive check
DMAAP_MED_COMPOSE_DIR="dmaapmed" # Dir in simulator_group for docker-compose
diff --git a/test/common/testcase_common.sh b/test/common/testcase_common.sh
index e1c90d6..80059a1 100755
--- a/test/common/testcase_common.sh
+++ b/test/common/testcase_common.sh
@@ -666,7 +666,7 @@
if [ $paramerror -eq 0 ]; then
if [ "$1" == "--print-stats" ]; then
PRINT_CURRENT_STATS=1
- echo "Option set - Print stats"
+ echo "Option set - Print stats after every test-case and config"
shift;
foundparm=0
fi
@@ -1270,10 +1270,10 @@
IMAGE_SUFFIX="none"
fi
# A function name is created from the app short name
- # for example app short name 'ECS' -> produce the function
- # name __ECS_imagesetup
+ # for example app short name 'ICS' -> produce the function
+ # name __ICS_imagesetup
# This function is called and is expected to exist in the imported
- # file for the ecs test functions
+ # file for the ics test functions
# The resulting function impl will call '__check_and_create_image_var' function
# with appropriate parameters
# If the image suffix is none, then the component decides the suffix
diff --git a/test/common/testengine_config.sh b/test/common/testengine_config.sh
index 3513464..24a3908 100644
--- a/test/common/testengine_config.sh
+++ b/test/common/testengine_config.sh
@@ -18,13 +18,13 @@
#
# List of short names for all supported apps, including simulators etc
-APP_SHORT_NAMES="PA ECS SDNC CP NGW RC RICSIM HTTPPROXY CBS CONSUL DMAAPMR MR CR PRODSTUB KUBEPROXY DMAAPMED DMAAPADP PVCCLEANER"
+APP_SHORT_NAMES="PA ICS SDNC CP NGW RC RICSIM HTTPPROXY CBS CONSUL DMAAPMR MR CR PRODSTUB KUBEPROXY DMAAPMED DMAAPADP PVCCLEANER"
# List of available apps that built and released of the project
-PROJECT_IMAGES="PA ECS SDNC CP NGW RICSIM RC DMAAPMED DMAAPADP"
+PROJECT_IMAGES="PA ICS SDNC CP NGW RICSIM RC DMAAPMED DMAAPADP"
# List of available apps to override with local or remote staging/snapshot/release image
-AVAILABLE_IMAGES_OVERRIDE="PA ECS SDNC CP NGW RICSIM RC DMAAPMED DMAAPADP"
+AVAILABLE_IMAGES_OVERRIDE="PA ICS SDNC CP NGW RICSIM RC DMAAPMED DMAAPADP"
# List of available apps where the image is built by the test environment
LOCAL_IMAGE_BUILD="MR CR PRODSTUB KUBEPROXY HTTPPROXY"