xapp-bs-connector --> xapp-sm-connector

README.md

@@ -37,7 +37,7 @@ root
 |  |
 |  └──sample-xapp
 |  |
-|  └──xapp-bs-connector
+|  └──xapp-sm-connector
 ```
 
 ### Quick start
@@ -66,7 +66,7 @@ This directory contains the implementations of the near-real-time RIC Docker con
 - `dbaas`: implementation of a Redis database (`db`) container
 - `e2`: implementation of the E2 termination (`e2term`) container
 - `e2mgr`: implementation of the E2 manager (`e2mgr`) and of the routing manager simulator (`e2rtmansim`) container
-- `sample-xapp`, `xapp-bs-connector`: implementation of the sample xApp provided in this repository and components to connect to the near-real-time RIC and [SCOPE](https://github.com/wineslab/colosseum-scope) RAN environment
+- `sample-xapp`, `xapp-sm-connector`: implementation of the sample xApp provided in this repository and components to connect to the near-real-time RIC and [SCOPE](https://github.com/wineslab/colosseum-scope) RAN environment
 
 These components are adapted from the [O-RAN Software Community RIC platform (Bronze)](https://github.com/o-ran-sc), which we extended to support the Colosseum environment, concurrent connections from multiple base stations and xApps, and to provide improved support for encoding, decoding and routing of control messages.
 
@@ -88,4 +88,4 @@ The sample xApp provided in this repository connects to the [SCOPE](https://gith
 After the near-real-time RIC has successfully started, the DU connected to it, and the xApp has been properly configured and started (see "Quick start" section above):
 - Enter the xApp docker container (named `sample-xapp-24` by default): `docker exec -it sample-xapp-24`
 - Move to the `/home/sample-xapp` directory inside the Docker container: `cd /home/sample-xapp`
-- Run the xApp logic: `./run_xapp.sh`. This script will open a socket between the sample Python script in the `sample-xapp` directory (which by defaults prints the data received from the RAN node) and the base station connector of the `xapp-bs-connector` directory, which performs ASN.1 encoding and decoding of E2AP messages. Then, the xApp will subscribe to the RAN node specified at container startup time through the gNB ID, and receive a RIC Indication Message with a data report from the RAN node with the periodicity of 250 ms.
+- Run the xApp logic: `./run_xapp.sh`. This script will open a socket between the sample Python script in the `sample-xapp` directory (which by defaults prints the data received from the RAN node) and the service model connector of the `xapp-sm-connector` directory, which performs ASN.1 encoding and decoding of E2AP messages. Then, the xApp will subscribe to the RAN node specified at container startup time through the gNB ID, and receive a RIC Indication Message with a data report from the RAN node with the periodicity of 250 ms.

setup-scripts/setup-sample-xapp.sh

@@ -5,7 +5,7 @@ set -x
 
 IMAGE_NAME=sample-xapp
 MODEL_DIR=sample-xapp
-CONNECTOR_DIR=xapp-bs-connector
+CONNECTOR_DIR=xapp-sm-connector
 DOCKER_FILE=Dockerfile
 SETUP_DIR=../setup
 
@@ -62,10 +62,10 @@ $SUDO docker run -d -it --entrypoint ${ENTRYPOINT} --network ric --ip ${XAPP_IP}
     -e DBAAS_SERVICE_HOST=$DBAAS_IP -e DBAAS_SERVICE_PORT=$DBAAS_PORT --name ${CONTAINER_NAME} ${IMAGE_NAME}:latest
 
 if [ -n "${GNB_ID}" ]; then
-    docker exec ${CONTAINER_NAME} sed -i "s/^export GNB_ID.*/export GNB_ID=${GNB_ID}/g" /home/xapp-bs-connector/build_xapp.sh
+    docker exec ${CONTAINER_NAME} sed -i "s/^export GNB_ID.*/export GNB_ID=${GNB_ID}/g" /home/xapp-sm-connector/build_xapp.sh
 fi
 
-docker exec ${CONTAINER_NAME} sed -i "s/^export XAPP_ID.*/export XAPP_ID=${XAPP_ID}/g" /home/xapp-bs-connector/build_xapp.sh
+docker exec ${CONTAINER_NAME} sed -i "s/^export XAPP_ID.*/export XAPP_ID=${XAPP_ID}/g" /home/xapp-sm-connector/build_xapp.sh
-docker exec ${CONTAINER_NAME} /home/xapp-bs-connector/build_xapp.sh clean
+docker exec ${CONTAINER_NAME} /home/xapp-sm-connector/build_xapp.sh clean
 docker container restart ${CONTAINER_NAME}
 

setup/sample-xapp/Dockerfile

@@ -3,7 +3,7 @@
 #------------------------------------
 ARG SCHEMA_PATH=schemas
 ARG XAPP_DIR=sample-xapp
-ARG CONNECTOR_DIR=xapp-bs-connector
+ARG CONNECTOR_DIR=xapp-sm-connector
 ARG STAGE_DIR=/home/${CONNECTOR_DIR}
 ARG DBAAS_SERVICE_HOST=10.0.2.12
 ARG DBAAS_SERVICE_PORT="6379"

setup/sample-xapp/run_xapp.sh

@@ -11,5 +11,5 @@ echo "[`date`] Pause 10 s" >> /home/container.log
 sleep 10
 
 echo "[`date`] Run connector" >> /home/container.log
-cd /home/xapp-bs-connector && ./run_xapp.sh
+cd /home/xapp-sm-connector && ./run_xapp.sh
 

setup/xapp-bs-connector/run_xapp.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-cd /home/xapp-bs-connector/init/ && python3 init_script.py config-file.json