Update script that generate test data for enrichment information

Issue-ID: NONRTRIC-534
Signed-off-by: ychacon <yennifer.chacon@est.tech>
Change-Id: Iba27804907cf874cf8b3efee3a0d9f3aa69bde20

diff --git a/nonrtric/data/run_in_k8s/populate_enrichment_data.sh b/nonrtric/data/run_in_k8s/populate_enrichment_data.sh
index fe6a3f8..14edb81 100755 (executable)
--- a/nonrtric/data/run_in_k8s/populate_enrichment_data.sh
+++ b/nonrtric/data/run_in_k8s/populate_enrichment_data.sh
@@ -33,50 +33,50 @@ echo -e "\n"
 
 # Create EiType
 echo "Create EiType:"
-curl -X PUT -skw %{http_code} $httpx://$ecs_host:$ecs_port/ei-producer/v1/eitypes/type1 -H accept:application/json -H Content-Type:application/json --data-binary @testdata/ECS/EiType.json
+curl -X PUT -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-producer/v1/info-types/type1 -H accept:application/json -H Content-Type:application/json --data-binary @testdata/ECS/EiType.json
 echo -e "\n"
 
 # Get EiTypes
 echo "Get EiTypes:"
-curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/ei-producer/v1/eitypes -H Content-Type:application/json
+curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-producer/v1/info-types -H Content-Type:application/json
 echo -e "\n"
 
 # Get Individual EiType
 echo "Get Individual EiType:"
-curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/ei-producer/v1/eitypes/type1 -H Content-Type:application/json
+curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-producer/v1/info-types/type1 -H Content-Type:application/json
 echo -e "\n"
 
 # Create EiProducer
 echo "Create EiProducer:"
-curl -X PUT -skw %{http_code} $httpx://$ecs_host:$ecs_port/ei-producer/v1/eiproducers/1 -H Content-Type:application/json --data-binary @testdata/ECS/EiProducer.json
+curl -X PUT -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-producer/v1/info-producers/1 -H Content-Type:application/json --data-binary @testdata/ECS/EiProducer.json
 echo -e "\n"
 
 # Get EiProducers
 echo "Get EiProducers:"
-curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/ei-producer/v1/eiproducers -H Content-Type:application/json
+curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-producer/v1/info-producers -H Content-Type:application/json
 echo -e "\n"
 
 # Get Individual EiProducer
 echo "Get Individual EiProducer:"
-curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/ei-producer/v1/eiproducers/1 -H Content-Type:application/json
+curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-producer/v1/info-producers/1 -H Content-Type:application/json
 echo -e "\n"
 
 # Get Individual EiProducer Status
 echo "Get Individual EiProducer:"
-curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/ei-producer/v1/eiproducers/1/status -H Content-Type:application/json
+curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-producer/v1/info-producers/1/status -H Content-Type:application/json
 echo -e "\n"
 
 # Create EiJob
 echo "Create EiJob Of A Certain Type type1:"
-curl -X PUT -skw %{http_code} $httpx://$ecs_host:$ecs_port/A1-EI/v1/eijobs/job1 -H Content-Type:application/json --data-binary @testdata/ECS/EiJob.json
+curl -X PUT -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-consumer/v1/info-jobs/job1 -H Content-Type:application/json --data-binary @testdata/ECS/EiJob.json
 echo -e "\n"
 
 # Get EiJobs
 echo "Get EiJobs:"
-curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/A1-EI/v1/eijobs -H Content-Type:application/json
+curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-consumer/v1/info-jobs -H Content-Type:application/json
 echo -e "\n"
 
 # Get Individual EiJob:
 echo "Get Individual EiJob:"
-curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/A1-EI/v1/eijobs/job1 -H Content-Type:application/json
+curl -X GET -skw %{http_code} $httpx://$ecs_host:$ecs_port/data-consumer/v1/info-jobs/job1 -H Content-Type:application/json
 echo -e "\n"
\ No newline at end of file

diff --git a/nonrtric/data/run_in_k8s/testdata/ECS/EiJob.json b/nonrtric/data/run_in_k8s/testdata/ECS/EiJob.json
index 003c70f..3939ee1 100644 (file)
--- a/nonrtric/data/run_in_k8s/testdata/ECS/EiJob.json
+++ b/nonrtric/data/run_in_k8s/testdata/ECS/EiJob.json
@@ -1,9 +1,9 @@
 {
-    "eiTypeId": "type1",
-    "jobResultUri": "https://ricsim_g3_1:8185/datadelivery",
-    "jobOwner": "ricsim_g3_1",
-    "jobStatusNotificationUri": "http://producer:80/",
-    "jobDefinition": {
+    "info_type_id": "type1",
+    "job_result_uri": "https://ricsim_g3_1:8185/datadelivery",
+    "job_owner": "ricsim_g3_1",
+    "status_notification_uri": "http://producer:80/",
+    "job_definition": {
         "jobparam1": "value1_job1",
         "jobparam2": "value2_job1",
         "jobparam3": "value3_job1"

diff --git a/nonrtric/data/run_in_k8s/testdata/ECS/EiProducer.json b/nonrtric/data/run_in_k8s/testdata/ECS/EiProducer.json
index 01d8eb5..4b7c6c9 100644 (file)
--- a/nonrtric/data/run_in_k8s/testdata/ECS/EiProducer.json
+++ b/nonrtric/data/run_in_k8s/testdata/ECS/EiProducer.json
@@ -1,5 +1,5 @@
 {
-    "supported_ei_types":["type1"],
-    "ei_job_callback_url": "https://producer-stub:8093/callbacks/job/prod-a",
-    "ei_producer_supervision_callback_url": "https://producer-stub:8093/callbacks/supervision/prod-a"
+    "supported_info_types":["type1"],
+    "info_job_callback_url": "https://producer-stub:8093/callbacks/job/prod-a",
+    "info_producer_supervision_callback_url": "https://producer-stub:8093/callbacks/supervision/prod-a"
 }
\ No newline at end of file

diff --git a/nonrtric/data/run_in_k8s/testdata/ECS/EiType.json b/nonrtric/data/run_in_k8s/testdata/ECS/EiType.json
index 073f0b4..8618555 100644 (file)
--- a/nonrtric/data/run_in_k8s/testdata/ECS/EiType.json
+++ b/nonrtric/data/run_in_k8s/testdata/ECS/EiType.json
@@ -1,8 +1,8 @@
 {
-    "ei_job_data_schema":{
-       "$schema":"http://json-schema.org/draft-07/schema#",
-       "title":"STD_Type1_1.0.0",
-       "description":"EI-Type 1",
-       "type":"object"
-    }
- }
\ No newline at end of file
+   "info_job_data_schema":{
+      "$schema":"http://json-schema.org/draft-07/schema#",
+      "title":"STD_Type1_1.0.0",
+      "description":"EI-Type 1",
+      "type":"object"
+   }
+}
\ No newline at end of file