Fix EiJob format in docker-compose data
Signed-off-by: ecaiyanlinux <martin.c.yan@est.tech>
Issue-Id: NONRTRIC-347
Change-Id: I1ba7ee7eff5e9b3940a8e5aa8139f0c1ecb8c378
diff --git a/docker-compose/data/prepareEcsData.sh b/docker-compose/data/prepareEcsData.sh
index f949f4c..ff149c9 100755
--- a/docker-compose/data/prepareEcsData.sh
+++ b/docker-compose/data/prepareEcsData.sh
@@ -42,16 +42,16 @@
curl -X GET -skw " %{http_code}" $httpx://localhost:$ecs_port/ei-producer/v1/eitypes -H Content-Type:application/json | jq
echo -e "\n"
-# Get Individual EiType
-echo "Get Individual EiType:"
-curl -X GET -skw " %{http_code}" $httpx://localhost:$ecs_port/ei-producer/v1/eitypes/type1 -H Content-Type:application/json | jq
-echo -e "\n"
-
# Create EiProducer
echo "Create EiProducer:"
curl -X PUT -skw " %{http_code}" $httpx://localhost:$ecs_port/ei-producer/v1/eiproducers/1 -H Content-Type:application/json --data-binary @testdata/ECS/EiProducer.json
echo -e "\n"
+# Get Individual EiType
+echo "Get Individual EiType:"
+curl -X GET -skw " %{http_code}" $httpx://localhost:$ecs_port/ei-producer/v1/eitypes/type1 -H Content-Type:application/json | jq
+echo -e "\n"
+
# Get EiProducers
echo "Get EiProducers:"
curl -X GET -skw " %{http_code}" $httpx://localhost:$ecs_port/ei-producer/v1/eiproducers -H Content-Type:application/json | jq
@@ -65,19 +65,4 @@
# Get Individual EiProducer Status
echo "Get Individual EiProducer:"
curl -X GET -skw " %{http_code}" $httpx://localhost:$ecs_port/ei-producer/v1/eiproducers/1/status -H Content-Type:application/json | jq
-echo -e "\n"
-
-# Create EiJob
-echo "Create EiJob Of A Certain Type type1:"
-curl -X PUT -skw " %{http_code}" $httpx://localhost:$ecs_port/A1-EI/v1/eitypes/type1/eijobs/job1 -H Content-Type:application/json --data-binary @testdata/ECS/EiJob.json
-echo -e "\n"
-
-# Get EiJobs Of A Certain Type type1
-echo "Get EiJobs Of A Certain Type type1:"
-curl -X GET -skw " %{http_code}" $httpx://localhost:$ecs_port/A1-EI/v1/eitypes/type1/eijobs -H Content-Type:application/json | jq
-echo -e "\n"
-
-# Get Individual EiJob:
-echo "Get Individual EiJob:"
-curl -X GET -skw " %{http_code}" $httpx://localhost:$ecs_port/A1-EI/v1/eitypes/type1/eijobs/job1 -H Content-Type:application/json | jq
echo -e "\n"
\ No newline at end of file
diff --git a/docker-compose/data/testdata/ECS/EiJob.json b/docker-compose/data/testdata/ECS/EiJob.json
index 30edb2c..de23e5f 100644
--- a/docker-compose/data/testdata/ECS/EiJob.json
+++ b/docker-compose/data/testdata/ECS/EiJob.json
@@ -1,5 +1,11 @@
{
- "jobOwner": "1",
- "jobParameters": {},
- "targetUri": "http://example.com"
- }
\ No newline at end of file
+ "eiTypeId": "type1",
+ "jobResultUri": "https://ricsim_g3_1:8185/datadelivery",
+ "jobOwner": "ricsim_g3_1",
+ "jobStatusNotificationUri": "https://callback-receiver:8091/callbacks/job1-status",
+ "jobDefinition": {
+ "jobparam1": "value1_job1",
+ "jobparam2": "value2_job1",
+ "jobparam3": "value3_job1"
+ }
+}
\ No newline at end of file
diff --git a/docker-compose/data/testdata/ECS/EiProducer.json b/docker-compose/data/testdata/ECS/EiProducer.json
index ebb4ad4..8cf45d5 100644
--- a/docker-compose/data/testdata/ECS/EiProducer.json
+++ b/docker-compose/data/testdata/ECS/EiProducer.json
@@ -1,9 +1,13 @@
{
- "ei_job_creation_callback_url": "http://example.com",
- "ei_job_deletion_callback_url": "http://example.com",
- "ei_producer_supervision_callback_url": "http://example.com",
"supported_ei_types": [{
- "ei_job_data_schema": {},
- "ei_type_identity": "type1"
- }]
+ "ei_type_identity": "type1",
+ "ei_job_data_schema": {
+ "$schema": "http://json-schema.org/draft-07/schema#",
+ "title": "STD_Type1_1.0.0",
+ "description": "EI-Type 1",
+ "type": "object"
+ }
+ }],
+ "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"
}
\ No newline at end of file
diff --git a/docker-compose/ecs/docker-compose.yml b/docker-compose/ecs/docker-compose.yml
index f38d224..bb88a5a 100644
--- a/docker-compose/ecs/docker-compose.yml
+++ b/docker-compose/ecs/docker-compose.yml
@@ -22,7 +22,7 @@
services:
ecs:
- image: nexus3.o-ran-sc.org:10003/o-ran-sc/nonrtric-enrichment-coordinator-service:1.0.0-SNAPSHOT
+ image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-enrichment-coordinator-service:1.0.0
container_name: ecs
networks:
default: