commit 01b64b350211e0bfc16af343402dedc55020917b
author Henrik Andersson <henrik.b.andersson@est.tech> Fri May 28 05:38:27 2021 +0000
committer Gerrit Code Review <gerrit@o-ran-sc.org> Fri May 28 05:38:27 2021 +0000
tree 0ea510f0a4b886d621fbbb9f5bb92ad04ead30f6
parent 6feeffdf7069bdea16dc5e9731afc5e72bc6213d
parent e29568dbbfe4bb333c936dfe7b54ba639fdef492

Merge "minor corrections"

docker-compose/data/prepareDmaapMsg.sh

diff --git a/docker-compose/data/prepareDmaapMsg.sh b/docker-compose/data/prepareDmaapMsg.sh
index 503b0d2..73b07bc 100755
--- a/docker-compose/data/prepareDmaapMsg.sh
+++ b/docker-compose/data/prepareDmaapMsg.sh
@@ -69,7 +69,7 @@
 echo -e "\n"
 
 echo "create policy type 2 to ric3:"
-curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_v1_port/policytype?id=2 -X PUT -H Accept:application/json -H Content-Type:application/json -H X-Requested-With:XMLHttpRequest --data-binary @testdata/v1/policy_type.json
+curl -skw %{http_code} $httpx://localhost:$a1_sim_STD_v1_port/policytype?id=2 -X PUT -H Accept:application/json -H Content-Type:application/json -H X-Requested-With:XMLHttpRequest --data-binary @testdata/v2/policy_type.json
 echo -e "\n"
 
 for i in {1..12}; do
@@ -91,7 +91,7 @@
 curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap/v1/dmaap-msg-service-create.json
 echo -e "\n"
 
-echo "ger result from mr of previous request:"
+echo "get result from mr of previous request:"
 curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq .
 echo -e "\n"
 
@@ -99,7 +99,7 @@
 curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap/v1/dmaap-msg-policy-create.json
 echo -e "\n"
 
-echo "ger result from mr of previous request:"
+echo "get result from mr of previous request:"
 curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq .
 echo -e "\n"
 
@@ -107,7 +107,7 @@
 curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap/v1/dmaap-msg-policy-get.json
 echo -e "\n"
 
-echo "ger result from mr of previous request:"
+echo "get result from mr of previous request:"
 curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq .
 echo -e "\n"
 
@@ -116,7 +116,7 @@
 curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap/v2/dmaap-msg-service-create.json
 echo -e "\n"
 
-echo "ger result from mr of previous request:"
+echo "get result from mr of previous request:"
 curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq .
 echo -e "\n"
 
@@ -124,7 +124,7 @@
 curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap/v2/dmaap-msg-policy-create.json
 echo -e "\n"
 
-echo "ger result from mr of previous request:"
+echo "get result from mr of previous request:"
 curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq .
 echo -e "\n"
 
@@ -132,7 +132,7 @@
 curl -k -X POST -sw %{http_code} -H accept:application/json -H Content-Type:application/json "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-READ/" --data-binary @testdata/dmaap/v2/dmaap-msg-policy-get.json
 echo -e "\n"
 
-echo "ger result from mr of previous request:"
+echo "get result from mr of previous request:"
 curl -X GET "$httpx://localhost:$dmaa_mr_port/events/A1-POLICY-AGENT-WRITE/users/policy-agent?timeout=15000&limit=100" -H "accept: application/json" -H "Content-Type: application/json" | jq .
 echo -e "\n"
 

docker-compose/ecs/docker-compose.yaml

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