Change of ECS to ICS in docker env etc.

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

diff --git a/docker-compose/.env b/docker-compose/.env
index 8c247be..abbce20 100644 (file)
--- a/docker-compose/.env
+++ b/docker-compose/.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"
 
 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-information-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"

 
 #CONSUMER
 CONSUMER_IMAGE_BASE="eexit/mirror-http-server"
 
 #CONSUMER
 CONSUMER_IMAGE_BASE="eexit/mirror-http-server"

diff --git a/docker-compose/README.md b/docker-compose/README.md
index 7b1eee5..8fcca7e 100644 (file)
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -65,8 +65,8 @@ All the generated data is shown on the web page
 By default, if the containers are started up and running by docker-compose file in the same directory, just run commands:
 ./preparePmsData.sh
 
 By default, if the containers are started up and running by docker-compose file in the same directory, just run commands:
 ./preparePmsData.sh
 

-prepareEcsData.sh
-This is to generate some data into the ECS microservice
+prepareIcsData.sh
+This is to generate some data into the ICS microservice

 
 prepareDmaapMsg.sh
 This is to generate some data into the Dmaap MR, so that PMS reads message from MR
 
 prepareDmaapMsg.sh
 This is to generate some data into the Dmaap MR, so that PMS reads message from MR


@@ -85,4 +85,4 @@ Make sure to follow the section regarding sample data so there is data available
 
 To start all the necessary components, run the following command:
 
 
 To start all the necessary components, run the following command:
 

-docker-compose -f docker-compose.yaml -f control-panel/docker-compose.yaml -f nonrtric-gateway/docker-compose.yaml -f policy-service/docker-compose.yaml -f ecs/docker-compose.yaml -f a1-sim/docker-compose.yaml up
+docker-compose -f docker-compose.yaml -f control-panel/docker-compose.yaml -f nonrtric-gateway/docker-compose.yaml -f policy-service/docker-compose.yaml -f ics/docker-compose.yaml -f a1-sim/docker-compose.yaml up

diff --git a/docker-compose/data/prepareEcsData.sh b/docker-compose/data/prepareIcsData.sh
similarity index 55%
rename from docker-compose/data/prepareEcsData.sh
rename to docker-compose/data/prepareIcsData.sh
index 21cc35b..5871776 100755 (executable)
--- a/docker-compose/data/prepareEcsData.sh
+++ b/docker-compose/data/prepareIcsData.sh
@@ -19,71 +19,71 @@
 
 # The scripts in data/ will generate some dummy data in the running system.
 # It will create:
 
 # 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:
 
 # Run command:

-# ./prepareEcsData.sh [ECS port] [http/https]
+# ./prepareIcsData.sh [ICS port] [http/https]

 
 

-ecs_port=${1:-8083}
+ics_port=${1:-8083}

 httpx=${4:-"http"}
 SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
 
 httpx=${4:-"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 "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"
 
 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"
 
 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"
 
 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"
 
 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"
 
 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"
 
 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"
 
 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"
 
 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"
 
 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"
 
 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
 echo -e "\n"
\ No newline at end of file

diff --git a/docker-compose/data/sendMsgToMediator.sh b/docker-compose/data/sendMsgToMediator.sh
index a2f3db3..2b8eb5f 100755 (executable)
--- a/docker-compose/data/sendMsgToMediator.sh
+++ b/docker-compose/data/sendMsgToMediator.sh
@@ -24,7 +24,7 @@
 # ./sendMsgToMediator.sh [dmaap-mr port] [http/https]
 
 SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
 # ./sendMsgToMediator.sh [dmaap-mr port] [http/https]
 
 SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)

-bash ${SHELL_FOLDER}/prepareEcsData.sh
+bash ${SHELL_FOLDER}/prepareIcsData.sh

 
 dmaa_mr_port=${1:-3904}
 httpx=${2:-"http"}
 
 dmaa_mr_port=${1:-3904}
 httpx=${2:-"http"}

diff --git a/docker-compose/data/testdata/ECS/EiJob.json b/docker-compose/data/testdata/ICS/InfoJob.json
similarity index 100%
rename from docker-compose/data/testdata/ECS/EiJob.json
rename to docker-compose/data/testdata/ICS/InfoJob.json

diff --git a/docker-compose/data/testdata/ECS/EiProducer.json b/docker-compose/data/testdata/ICS/InfoProducer.json
similarity index 100%
rename from docker-compose/data/testdata/ECS/EiProducer.json
rename to docker-compose/data/testdata/ICS/InfoProducer.json

diff --git a/docker-compose/data/testdata/ECS/EiType.json b/docker-compose/data/testdata/ICS/InfoType.json
similarity index 100%
rename from docker-compose/data/testdata/ECS/EiType.json
rename to docker-compose/data/testdata/ICS/InfoType.json

diff --git a/docker-compose/data/testdata/dmaap-mediator-java/flow.puml b/docker-compose/data/testdata/dmaap-mediator-java/flow.puml
index 5295fa6..9096720 100644 (file)
--- a/docker-compose/data/testdata/dmaap-mediator-java/flow.puml
+++ b/docker-compose/data/testdata/dmaap-mediator-java/flow.puml
@@ -1,5 +1,5 @@
 @startuml
 dmaap_mr <- dmaap_mediator: dmaap_mediator reads msg from dmaap_mr
 @startuml
 dmaap_mr <- dmaap_mediator: dmaap_mediator reads msg from dmaap_mr

-dmaap_mediator -> ecs: dmaap_mediator gets jobs from ecs
+dmaap_mediator -> ics: dmaap_mediator gets jobs from ics

 dmaap_mediator -> consumer: callbackUrl, send msg to consumer
 @enduml
\ No newline at end of file
 dmaap_mediator -> consumer: callbackUrl, send msg to consumer
 @enduml
\ No newline at end of file

diff --git a/docker-compose/dmaap-mediator-java/config/application.yaml b/docker-compose/dmaap-mediator-java/config/application.yaml
index 57fd8ce..b34d02a 100755 (executable)
--- a/docker-compose/dmaap-mediator-java/config/application.yaml
+++ b/docker-compose/dmaap-mediator-java/config/application.yaml
@@ -46,7 +46,7 @@ app:
     http.proxy-host:
     http.proxy-port: 0
   vardata-directory: /var/dmaap-adaptor-service
     http.proxy-host:
     http.proxy-port: 0
   vardata-directory: /var/dmaap-adaptor-service

-  ecs-base-url: http://ecs:8083
+  ics-base-url: http://ics:8083

   # Location of the component configuration file. The file will only be used if the Consul database is not used;
   # configuration from the Consul will override the file.
   configuration-filepath: /opt/app/dmaap-adaptor-service/data/application_configuration.json
   # Location of the component configuration file. The file will only be used if the Consul database is not used;
   # configuration from the Consul will override the file.
   configuration-filepath: /opt/app/dmaap-adaptor-service/data/application_configuration.json

diff --git a/docker-compose/ecs/docker-compose.yaml b/docker-compose/ics/docker-compose.yaml
similarity index 100%
rename from docker-compose/ecs/docker-compose.yaml
rename to docker-compose/ics/docker-compose.yaml

diff --git a/docs/installation-guide.rst b/docs/installation-guide.rst
index c19a2d4..0404192 100644 (file)
--- a/docs/installation-guide.rst
+++ b/docs/installation-guide.rst
@@ -28,7 +28,7 @@ command to start the components:
 
          docker-compose -f docker-compose.yaml
            -f policy-service/docker-compose.yaml
 
          docker-compose -f docker-compose.yaml
            -f policy-service/docker-compose.yaml

-           -f ecs/docker-compose.yaml
+           -f ics/docker-compose.yaml

 
 Install with Helm
 +++++++++++++++++
 
 Install with Helm
 +++++++++++++++++