Update scripts for ECS docker-compose deployment

Support latest interface
Use latest ECS image

Signed-off-by: ecaiyanlinux <martin.c.yan@est.tech>
Change-Id: I9f574f1973e0215252a6243a0b653468bb884087
Issue-ID: NONRTRIC-421

diff --git a/docker-compose/data/prepareEcsData.sh b/docker-compose/data/prepareEcsData.sh
index 76b5a05..205fc8c 100755 (executable)
--- a/docker-compose/data/prepareEcsData.sh
+++ b/docker-compose/data/prepareEcsData.sh
@@ -37,47 +37,52 @@ echo "ECS status:"
 curl -skw " %{http_code}" $httpx://localhost:$ecs_port/status
 echo -e "\n"
 
+# Create EiType
+echo "Create EiType:"
+curl -X PUT -skw %{http_code} $httpx://localhost:$ecs_port/ei-producer/v1/eitypes/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://localhost:$ecs_port/ei-producer/v1/eitypes -H Content-Type:application/json | jq
+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
+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
+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 EiProducers
 echo "Get EiProducers:"
-curl -X GET -skw " %{http_code}" $httpx://localhost:$ecs_port/ei-producer/v1/eiproducers -H Content-Type:application/json | jq
+curl -X GET -skw %{http_code} $httpx://localhost:$ecs_port/ei-producer/v1/eiproducers -H Content-Type:application/json | jq
 echo -e "\n"
 
 # Get Individual EiProducer
 echo "Get Individual EiProducer:"
-curl -X GET -skw " %{http_code}" $httpx://localhost:$ecs_port/ei-producer/v1/eiproducers/1 -H Content-Type:application/json | jq
+curl -X GET -skw %{http_code} $httpx://localhost:$ecs_port/ei-producer/v1/eiproducers/1 -H Content-Type:application/json | jq
 echo -e "\n"
 
 # 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
+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/eijobs/job1 -H Content-Type:application/json --data-binary @testdata/ECS/EiJob.json
+curl -X PUT -skw %{http_code} $httpx://localhost:$ecs_port/A1-EI/v1/eijobs/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://localhost:$ecs_port/A1-EI/v1/eijobs -H Content-Type:application/json | jq
+curl -X GET -skw %{http_code} $httpx://localhost:$ecs_port/A1-EI/v1/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/eijobs/job1 -H Content-Type:application/json | jq
+curl -X GET -skw %{http_code} $httpx://localhost:$ecs_port/A1-EI/v1/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/EiProducer.json b/docker-compose/data/testdata/ECS/EiProducer.json
index bb9a1b3..01d8eb5 100644 (file)
--- a/docker-compose/data/testdata/ECS/EiProducer.json
+++ b/docker-compose/data/testdata/ECS/EiProducer.json
@@ -1,13 +1,5 @@
 {
-    "supported_ei_types": [{
-        "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": "http://producer:80/",
-    "ei_producer_supervision_callback_url": "http://producer:80/"
+    "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"
 }
\ No newline at end of file

diff --git a/docker-compose/data/testdata/ECS/EiType.json b/docker-compose/data/testdata/ECS/EiType.json
new file mode 100644 (file)
index 0000000..073f0b4
--- /dev/null
+++ b/docker-compose/data/testdata/ECS/EiType.json
@@ -0,0 +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

diff --git a/docker-compose/ecs/docker-compose.yaml b/docker-compose/ecs/docker-compose.yaml
index d33f329..5cf391c 100644 (file)
--- a/docker-compose/ecs/docker-compose.yaml
+++ b/docker-compose/ecs/docker-compose.yaml
@@ -22,7 +22,7 @@ networks:
 
 services:
   ecs:
-    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-enrichment-coordinator-service:1.1.0
+    image: nexus3.o-ran-sc.org:10004/o-ran-sc/nonrtric-enrichment-coordinator-service:1.1.1
     container_name: ecs
     networks:
       default: