From: Martin Skorupski Date: Fri, 4 Mar 2022 14:29:39 +0000 (+0000) Subject: Merge "remove dependency to unused tile-server" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=90a9f1b3ea0cb0add7bb6e34cbd4f29b5b159325;hp=a4cce238193b86b8492264be11a3991f585a57c7;p=oam.git Merge "remove dependency to unused tile-server" --- diff --git a/solution/README.md b/solution/README.md index f694400..09f94d6 100644 --- a/solution/README.md +++ b/solution/README.md @@ -1,6 +1,6 @@ # Solution -Contains assemblys of containers to provide a service. +Contains assemblies of containers to provide a service. * Providing development or integration test environment. * Running on docker/docker-compose or kubernetes. diff --git a/solution/integration/README.md b/solution/integration/README.md index 768f5b3..9ffd686 100644 --- a/solution/integration/README.md +++ b/solution/integration/README.md @@ -117,6 +117,7 @@ export PYTHONWARNINGS="ignore:Unverified HTTPS request" │ ├── docker │ ├── identity │ ├── kafka + │ ├── o-ran-sc-topology-service │ └── zookeeper ├── non-rt-ric │ ├── docker-compose.yml @@ -177,7 +178,7 @@ docker-compose -f smo/oam/docker-compose.yml up -d docker-compose -f smo/non-rt-ric/docker-compose.yml up -d ``` -In order to create/deploy the apex policy for O-RU closed loop recovery usecase, +In order to create/deploy the apex policy for O-RU closed loop recovery use case, refer to the section named "Create/Deploy apex policy for O-RU & O-DU use case" in this page: https://wiki.o-ran-sc.org/pages/viewpage.action?pageId=35881325 @@ -194,16 +195,16 @@ If you see the login page (https://sdnc-web:8453) you are good to go and can sta ### populate data into Non-RT-RIC -Full instrucion on how to run Non-RT-RIC can be found in this page: +Full instruction on how to run Non-RT-RIC can be found in this page: -When containers in Non-RT-RIC are all up, by default, there is no data running inside. Folder `non-rt-ric/data/` contains serveral scripts to populate data into Non-RT-RIC for test & demo purpose. +When containers in Non-RT-RIC are all up, by default, there is no data running inside. Folder `non-rt-ric/data/` contains several scripts to populate data into Non-RT-RIC for test & demo purpose. ``` bash prepareDmaapMsg.sh ``` -script `prepareDmaapMsg.sh` sends messages to dmaap message router, then Non-RT-RIC policy-agent service polls messages from dmaap, and creates policy instances accordingly. +script `prepareDmaapMsg.sh` sends messages to DMaaP message router, then Non-RT-RIC policy-agent service polls messages from DMaaP, and creates policy instances accordingly. ``` bash preparePmsData.sh @@ -301,6 +302,12 @@ docker logs ecs In case of trouble, please update the commands with your customized '.env' file. +#### Access to Topology Service + +``` +curl -u admin:admin http://localhost:18181/rests/data/network-topology:network-topology/topology=topology-netconf/node=o-ran-sc-topology-service/yang-ext:mount/tapi-common:context/tapi-topology:topology-context +``` + ### Terminate solution To stop all container please respect the following order diff --git a/solution/integration/smo/common/.env b/solution/integration/smo/common/.env index a529aab..2498330 100644 --- a/solution/integration/smo/common/.env +++ b/solution/integration/smo/common/.env @@ -49,4 +49,4 @@ KAFKA_IMAGE=nexus3.onap.org:10001/onap/dmaap/kafka111:1.0.4 DMAAP_IMAGE=nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.18 # O-RAN-SC Topology service -O_RAN_SC_TOPOLOGY_IMAGE=nexus3.o-ran-sc.org:10004/o-ran-sc/smo-nts-ng-topology-server:1.4.5 +O_RAN_SC_TOPOLOGY_IMAGE=nexus3.o-ran-sc.org:10001/o-ran-sc/smo-nts-ng-topology-server:1.4.5