From c41e480c37bbb234b2ee4f73a9750f78f8dba80c Mon Sep 17 00:00:00 2001 From: ecaiyanlinux Date: Tue, 30 Nov 2021 05:38:07 +0100 Subject: [PATCH] Update smo deployment with ICS change of ECS to ICS Signed-off-by: ecaiyanlinux Issue-ID: NONRTRIC-625 Change-Id: Ic7f10b97f172d10f4bbd7f801567a4cdeaa99441 --- solution/integration/smo/non-rt-ric/.env | 6 +- .../application-nonrtricgateway.yaml | 4 +- .../data/{prepareEcsData.sh => prepareIcsData.sh} | 76 +++++++++++----------- .../testdata/{ECS/EiJob.json => ICS/InfoJob.json} | 0 .../{ECS/EiProducer.json => ICS/InfoProducer.json} | 0 .../{ECS/EiType.json => ICS/InfoType.json} | 0 .../integration/smo/non-rt-ric/docker-compose.yml | 6 +- .../smo/non-rt-ric/test/health_check.sh | 6 +- .../integration/smo/non-rt-ric/test/pms_a1sim.sh | 2 +- .../smo/non-rt-ric/test/pms_a1sim_sdnc.sh | 2 +- 10 files changed, 51 insertions(+), 51 deletions(-) rename solution/integration/smo/non-rt-ric/data/{prepareEcsData.sh => prepareIcsData.sh} (55%) rename solution/integration/smo/non-rt-ric/data/testdata/{ECS/EiJob.json => ICS/InfoJob.json} (100%) rename solution/integration/smo/non-rt-ric/data/testdata/{ECS/EiProducer.json => ICS/InfoProducer.json} (100%) rename solution/integration/smo/non-rt-ric/data/testdata/{ECS/EiType.json => ICS/InfoType.json} (100%) diff --git a/solution/integration/smo/non-rt-ric/.env b/solution/integration/smo/non-rt-ric/.env index 0223a4c..fb58a4a 100644 --- a/solution/integration/smo/non-rt-ric/.env +++ b/solution/integration/smo/non-rt-ric/.env @@ -35,9 +35,9 @@ CONTROL_PANEL_IMAGE_TAG="2.2.0" NONRTRIC_GATEWAY_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-gateway" NONRTRIC_GATEWAY_IMAGE_TAG="1.0.0" -#ECS -ECS_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-enrichment-coordinator-service" -ECS_IMAGE_TAG="1.1.0" +#ICS +ICS_IMAGE_BASE="nexus3.o-ran-sc.org:10002/o-ran-sc/nonrtric-information-coordinator-service" +ICS_IMAGE_TAG="1.1.0" #PRODUCER PRODUCER_IMAGE_BASE="eexit/mirror-http-server" diff --git a/solution/integration/smo/non-rt-ric/config/nonrtric-gateway/application-nonrtricgateway.yaml b/solution/integration/smo/non-rt-ric/config/nonrtric-gateway/application-nonrtricgateway.yaml index 08b386c..d4d93be 100644 --- a/solution/integration/smo/non-rt-ric/config/nonrtric-gateway/application-nonrtricgateway.yaml +++ b/solution/integration/smo/non-rt-ric/config/nonrtric-gateway/application-nonrtricgateway.yaml @@ -31,11 +31,11 @@ spring: predicates: - Path=/a1-policy/** - id: A1-EI - uri: http://ecs:8083 + uri: http://ics:8083 predicates: - Path=/ei-producer/** - id: A1-EI2 - uri: http://ecs:8083 + uri: http://ics:8083 predicates: - Path=/data-producer/**,/data-consumer/** management: diff --git a/solution/integration/smo/non-rt-ric/data/prepareEcsData.sh b/solution/integration/smo/non-rt-ric/data/prepareIcsData.sh similarity index 55% rename from solution/integration/smo/non-rt-ric/data/prepareEcsData.sh rename to solution/integration/smo/non-rt-ric/data/prepareIcsData.sh index 6224f75..c407140 100755 --- a/solution/integration/smo/non-rt-ric/data/prepareEcsData.sh +++ b/solution/integration/smo/non-rt-ric/data/prepareIcsData.sh @@ -19,71 +19,71 @@ # The scripts in data/ will generate some dummy data in the running system. # It will create: -# one EiProducer in ECS -# one EiType in ECS -# one EiJob in ECS +# one InfoProducer in ICS +# one InfoType in ICS +# one InfoJob in ICS # Run command: -# ./prepareEcsData.sh [ECS port] [http/https] +# ./prepareIcsData.sh [ICS port] [http/https] -ecs_port=${1:-8083} +ics_port=${1:-8083} httpx=${2:-"http"} SHELL_FOLDER=$(cd "$(dirname "$0")";pwd) -echo "using ecs port: "$ecs_port +echo "using ics port: "$ics_port echo "using protocol: "$httpx echo -e "\n" -echo "ECS status:" -curl -skw " %{http_code}" $httpx://localhost:$ecs_port/status +echo "ICS status:" +curl -skw " %{http_code}" $httpx://localhost:$ics_port/status echo -e "\n" -# Create EiType -echo "Create EiType:" -curl -X PUT -skw %{http_code} $httpx://localhost:$ecs_port/data-producer/v1/info-types/type1 -H accept:application/json -H Content-Type:application/json --data-binary @${SHELL_FOLDER}/testdata/ECS/EiType.json +# Create InfoType +echo "Create InfoType:" +curl -X PUT -skw %{http_code} $httpx://localhost:$ics_port/data-producer/v1/info-types/type1 -H accept:application/json -H Content-Type:application/json --data-binary @${SHELL_FOLDER}/testdata/ICS/InfoType.json echo -e "\n" -# Get EiTypes -echo "Get EiTypes:" -curl -X GET -skw %{http_code} $httpx://localhost:$ecs_port/data-producer/v1/info-types -H Content-Type:application/json | jq +# Get InfoTypes +echo "Get InfoTypes:" +curl -X GET -skw %{http_code} $httpx://localhost:$ics_port/data-producer/v1/info-types -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/data-producer/v1/info-types/type1 -H Content-Type:application/json | jq +# Get Individual InfoType +echo "Get Individual InfoType:" +curl -X GET -skw %{http_code} $httpx://localhost:$ics_port/data-producer/v1/info-types/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/data-producer/v1/info-producers/1 -H Content-Type:application/json --data-binary @${SHELL_FOLDER}/testdata/ECS/EiProducer.json +# Create InfoProducer +echo "Create InfoProducer:" +curl -X PUT -skw %{http_code} $httpx://localhost:$ics_port/data-producer/v1/info-producers/1 -H Content-Type:application/json --data-binary @${SHELL_FOLDER}/testdata/ICS/InfoProducer.json echo -e "\n" -# Get EiProducers -echo "Get EiProducers:" -curl -X GET -skw %{http_code} $httpx://localhost:$ecs_port/data-producer/v1/info-producers -H Content-Type:application/json | jq +# Get InfoProducers +echo "Get InfoProducers:" +curl -X GET -skw %{http_code} $httpx://localhost:$ics_port/data-producer/v1/info-producers -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/data-producer/v1/info-producers/1 -H Content-Type:application/json | jq +# Get Individual InfoProducer +echo "Get Individual InfoProducer:" +curl -X GET -skw %{http_code} $httpx://localhost:$ics_port/data-producer/v1/info-producers/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/data-producer/v1/info-producers/1/status -H Content-Type:application/json | jq +# Get Individual InfoProducer Status +echo "Get Individual InfoProducer:" +curl -X GET -skw %{http_code} $httpx://localhost:$ics_port/data-producer/v1/info-producers/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 @${SHELL_FOLDER}/testdata/ECS/EiJob.json +# Create InfoJob +echo "Create InfoJob Of A Certain Type type1:" +curl -X PUT -skw %{http_code} $httpx://localhost:$ics_port/A1-EI/v1/eijobs/job1 -H Content-Type:application/json --data-binary @${SHELL_FOLDER}/testdata/ICS/InfoJob.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 +# Get InfoJobs +echo "Get InfoJobs:" +curl -X GET -skw %{http_code} $httpx://localhost:$ics_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 +# Get Individual InfoJob: +echo "Get Individual InfoJob:" +curl -X GET -skw %{http_code} $httpx://localhost:$ics_port/A1-EI/v1/eijobs/job1 -H Content-Type:application/json | jq echo -e "\n" \ No newline at end of file diff --git a/solution/integration/smo/non-rt-ric/data/testdata/ECS/EiJob.json b/solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoJob.json similarity index 100% rename from solution/integration/smo/non-rt-ric/data/testdata/ECS/EiJob.json rename to solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoJob.json diff --git a/solution/integration/smo/non-rt-ric/data/testdata/ECS/EiProducer.json b/solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoProducer.json similarity index 100% rename from solution/integration/smo/non-rt-ric/data/testdata/ECS/EiProducer.json rename to solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoProducer.json diff --git a/solution/integration/smo/non-rt-ric/data/testdata/ECS/EiType.json b/solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoType.json similarity index 100% rename from solution/integration/smo/non-rt-ric/data/testdata/ECS/EiType.json rename to solution/integration/smo/non-rt-ric/data/testdata/ICS/InfoType.json diff --git a/solution/integration/smo/non-rt-ric/docker-compose.yml b/solution/integration/smo/non-rt-ric/docker-compose.yml index ef7b9d0..a367eff 100644 --- a/solution/integration/smo/non-rt-ric/docker-compose.yml +++ b/solution/integration/smo/non-rt-ric/docker-compose.yml @@ -117,9 +117,9 @@ services: volumes: - ./config/nonrtric-gateway/application-nonrtricgateway.yaml:/opt/app/nonrtric-gateway/config/application.yaml:ro - ecs: - image: "${ECS_IMAGE_BASE}:${ECS_IMAGE_TAG}" - container_name: ecs + ics: + image: "${ICS_IMAGE_BASE}:${ICS_IMAGE_TAG}" + container_name: ics networks: - default ports: diff --git a/solution/integration/smo/non-rt-ric/test/health_check.sh b/solution/integration/smo/non-rt-ric/test/health_check.sh index 8ccd627..537a20f 100755 --- a/solution/integration/smo/non-rt-ric/test/health_check.sh +++ b/solution/integration/smo/non-rt-ric/test/health_check.sh @@ -64,8 +64,8 @@ checkStatus "curl -skw %{http_code} http://localhost:30005/" "OK200" "SIM3" echo "check PMS status:" checkStatus "curl -skw %{http_code} http://localhost:8091/status" "hunky dory200" "PMS" -# check ECS status -echo "check ECS status:" -checkStatus "curl -skw %{http_code} http://localhost:8083/status" '{"status":"hunky dory","no_of_producers":0,"no_of_types":0,"no_of_jobs":0}200' "ECS" +# check ICS status +echo "check ICS status:" +checkStatus "curl -skw %{http_code} http://localhost:8083/status" '{"status":"hunky dory","no_of_producers":0,"no_of_types":0,"no_of_jobs":0}200' "ICS" echo "NONRTRIC health check passed." diff --git a/solution/integration/smo/non-rt-ric/test/pms_a1sim.sh b/solution/integration/smo/non-rt-ric/test/pms_a1sim.sh index db61592..38c7e04 100755 --- a/solution/integration/smo/non-rt-ric/test/pms_a1sim.sh +++ b/solution/integration/smo/non-rt-ric/test/pms_a1sim.sh @@ -62,6 +62,6 @@ checkStatus "curl -skw %{http_code} http://localhost:8091/status" "hunky dory200 cd ${SHELL_FOLDER}/../data ./preparePmsData.sh -./prepareEcsData.sh +./prepareIcsData.sh diff --git a/solution/integration/smo/non-rt-ric/test/pms_a1sim_sdnc.sh b/solution/integration/smo/non-rt-ric/test/pms_a1sim_sdnc.sh index c3c4923..cbd1024 100755 --- a/solution/integration/smo/non-rt-ric/test/pms_a1sim_sdnc.sh +++ b/solution/integration/smo/non-rt-ric/test/pms_a1sim_sdnc.sh @@ -66,4 +66,4 @@ checkStatus "curl -s -o /dev/null -I -w %{http_code} http://localhost:8282/apido cd ${SHELL_FOLDER}/../data ./preparePmsData.sh -./prepareEcsData.sh +./prepareIcsData.sh -- 2.16.6