diff --git a/README.md b/README.md index 79cabe2..e16a70e 100644 --- a/README.md +++ b/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. diff --git a/setup-scripts/setup-sample-xapp.sh b/setup-scripts/setup-sample-xapp.sh index 5c4fa12..a5e8737 100755 --- a/setup-scripts/setup-sample-xapp.sh +++ b/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} /home/xapp-bs-connector/build_xapp.sh clean +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-sm-connector/build_xapp.sh clean docker container restart ${CONTAINER_NAME} diff --git a/setup/sample-xapp/Dockerfile b/setup/sample-xapp/Dockerfile index 49081ff..04d4409 100644 --- a/setup/sample-xapp/Dockerfile +++ b/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" diff --git a/setup/sample-xapp/run_xapp.sh b/setup/sample-xapp/run_xapp.sh index b7f2bf8..5e71b4e 100755 --- a/setup/sample-xapp/run_xapp.sh +++ b/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 diff --git a/setup/xapp-bs-connector/run_xapp.sh b/setup/xapp-bs-connector/run_xapp.sh deleted file mode 100755 index 2d51721..0000000 --- a/setup/xapp-bs-connector/run_xapp.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -cd /home/xapp-bs-connector/init/ && python3 init_script.py config-file.json diff --git a/setup/xapp-bs-connector/.gitignore b/setup/xapp-sm-connector/.gitignore similarity index 100% rename from setup/xapp-bs-connector/.gitignore rename to setup/xapp-sm-connector/.gitignore diff --git a/setup/xapp-bs-connector/.readthedocs.yaml b/setup/xapp-sm-connector/.readthedocs.yaml similarity index 100% rename from setup/xapp-bs-connector/.readthedocs.yaml rename to setup/xapp-sm-connector/.readthedocs.yaml diff --git a/setup/xapp-bs-connector/INFO.yaml b/setup/xapp-sm-connector/INFO.yaml similarity index 100% rename from setup/xapp-bs-connector/INFO.yaml rename to setup/xapp-sm-connector/INFO.yaml diff --git a/setup/xapp-bs-connector/README b/setup/xapp-sm-connector/README similarity index 100% rename from setup/xapp-bs-connector/README rename to setup/xapp-sm-connector/README diff --git a/setup/xapp-bs-connector/asn1c_defs/ANY.c b/setup/xapp-sm-connector/asn1c_defs/ANY.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ANY.c rename to setup/xapp-sm-connector/asn1c_defs/ANY.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ANY.h b/setup/xapp-sm-connector/asn1c_defs/ANY.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ANY.h rename to setup/xapp-sm-connector/asn1c_defs/ANY.h diff --git a/setup/xapp-bs-connector/asn1c_defs/BIT_STRING.c b/setup/xapp-sm-connector/asn1c_defs/BIT_STRING.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/BIT_STRING.c rename to setup/xapp-sm-connector/asn1c_defs/BIT_STRING.c diff --git a/setup/xapp-bs-connector/asn1c_defs/BIT_STRING.h b/setup/xapp-sm-connector/asn1c_defs/BIT_STRING.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/BIT_STRING.h rename to setup/xapp-sm-connector/asn1c_defs/BIT_STRING.h diff --git a/setup/xapp-bs-connector/asn1c_defs/BOOLEAN.c b/setup/xapp-sm-connector/asn1c_defs/BOOLEAN.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/BOOLEAN.c rename to setup/xapp-sm-connector/asn1c_defs/BOOLEAN.c diff --git a/setup/xapp-bs-connector/asn1c_defs/BOOLEAN.h b/setup/xapp-sm-connector/asn1c_defs/BOOLEAN.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/BOOLEAN.h rename to setup/xapp-sm-connector/asn1c_defs/BOOLEAN.h diff --git a/setup/xapp-bs-connector/asn1c_defs/Cause.c b/setup/xapp-sm-connector/asn1c_defs/Cause.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/Cause.c rename to setup/xapp-sm-connector/asn1c_defs/Cause.c diff --git a/setup/xapp-bs-connector/asn1c_defs/Cause.h b/setup/xapp-sm-connector/asn1c_defs/Cause.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/Cause.h rename to setup/xapp-sm-connector/asn1c_defs/Cause.h diff --git a/setup/xapp-bs-connector/asn1c_defs/CauseMisc.c b/setup/xapp-sm-connector/asn1c_defs/CauseMisc.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CauseMisc.c rename to setup/xapp-sm-connector/asn1c_defs/CauseMisc.c diff --git a/setup/xapp-bs-connector/asn1c_defs/CauseMisc.h b/setup/xapp-sm-connector/asn1c_defs/CauseMisc.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CauseMisc.h rename to setup/xapp-sm-connector/asn1c_defs/CauseMisc.h diff --git a/setup/xapp-bs-connector/asn1c_defs/CauseProtocol.c b/setup/xapp-sm-connector/asn1c_defs/CauseProtocol.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CauseProtocol.c rename to setup/xapp-sm-connector/asn1c_defs/CauseProtocol.c diff --git a/setup/xapp-bs-connector/asn1c_defs/CauseProtocol.h b/setup/xapp-sm-connector/asn1c_defs/CauseProtocol.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CauseProtocol.h rename to setup/xapp-sm-connector/asn1c_defs/CauseProtocol.h diff --git a/setup/xapp-bs-connector/asn1c_defs/CauseRIC.c b/setup/xapp-sm-connector/asn1c_defs/CauseRIC.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CauseRIC.c rename to setup/xapp-sm-connector/asn1c_defs/CauseRIC.c diff --git a/setup/xapp-bs-connector/asn1c_defs/CauseRIC.h b/setup/xapp-sm-connector/asn1c_defs/CauseRIC.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CauseRIC.h rename to setup/xapp-sm-connector/asn1c_defs/CauseRIC.h diff --git a/setup/xapp-bs-connector/asn1c_defs/CauseRICservice.c b/setup/xapp-sm-connector/asn1c_defs/CauseRICservice.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CauseRICservice.c rename to setup/xapp-sm-connector/asn1c_defs/CauseRICservice.c diff --git a/setup/xapp-bs-connector/asn1c_defs/CauseRICservice.h b/setup/xapp-sm-connector/asn1c_defs/CauseRICservice.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CauseRICservice.h rename to setup/xapp-sm-connector/asn1c_defs/CauseRICservice.h diff --git a/setup/xapp-bs-connector/asn1c_defs/CauseTransport.c b/setup/xapp-sm-connector/asn1c_defs/CauseTransport.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CauseTransport.c rename to setup/xapp-sm-connector/asn1c_defs/CauseTransport.c diff --git a/setup/xapp-bs-connector/asn1c_defs/CauseTransport.h b/setup/xapp-sm-connector/asn1c_defs/CauseTransport.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CauseTransport.h rename to setup/xapp-sm-connector/asn1c_defs/CauseTransport.h diff --git a/setup/xapp-bs-connector/asn1c_defs/Criticality.c b/setup/xapp-sm-connector/asn1c_defs/Criticality.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/Criticality.c rename to setup/xapp-sm-connector/asn1c_defs/Criticality.c diff --git a/setup/xapp-bs-connector/asn1c_defs/Criticality.h b/setup/xapp-sm-connector/asn1c_defs/Criticality.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/Criticality.h rename to setup/xapp-sm-connector/asn1c_defs/Criticality.h diff --git a/setup/xapp-bs-connector/asn1c_defs/CriticalityDiagnostics-IE-Item.c b/setup/xapp-sm-connector/asn1c_defs/CriticalityDiagnostics-IE-Item.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CriticalityDiagnostics-IE-Item.c rename to setup/xapp-sm-connector/asn1c_defs/CriticalityDiagnostics-IE-Item.c diff --git a/setup/xapp-bs-connector/asn1c_defs/CriticalityDiagnostics-IE-Item.h b/setup/xapp-sm-connector/asn1c_defs/CriticalityDiagnostics-IE-Item.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CriticalityDiagnostics-IE-Item.h rename to setup/xapp-sm-connector/asn1c_defs/CriticalityDiagnostics-IE-Item.h diff --git a/setup/xapp-bs-connector/asn1c_defs/CriticalityDiagnostics-IE-List.c b/setup/xapp-sm-connector/asn1c_defs/CriticalityDiagnostics-IE-List.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CriticalityDiagnostics-IE-List.c rename to setup/xapp-sm-connector/asn1c_defs/CriticalityDiagnostics-IE-List.c diff --git a/setup/xapp-bs-connector/asn1c_defs/CriticalityDiagnostics-IE-List.h b/setup/xapp-sm-connector/asn1c_defs/CriticalityDiagnostics-IE-List.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CriticalityDiagnostics-IE-List.h rename to setup/xapp-sm-connector/asn1c_defs/CriticalityDiagnostics-IE-List.h diff --git a/setup/xapp-bs-connector/asn1c_defs/CriticalityDiagnostics.c b/setup/xapp-sm-connector/asn1c_defs/CriticalityDiagnostics.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CriticalityDiagnostics.c rename to setup/xapp-sm-connector/asn1c_defs/CriticalityDiagnostics.c diff --git a/setup/xapp-bs-connector/asn1c_defs/CriticalityDiagnostics.h b/setup/xapp-sm-connector/asn1c_defs/CriticalityDiagnostics.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/CriticalityDiagnostics.h rename to setup/xapp-sm-connector/asn1c_defs/CriticalityDiagnostics.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2AP-PDU.c b/setup/xapp-sm-connector/asn1c_defs/E2AP-PDU.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2AP-PDU.c rename to setup/xapp-sm-connector/asn1c_defs/E2AP-PDU.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2AP-PDU.h b/setup/xapp-sm-connector/asn1c_defs/E2AP-PDU.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2AP-PDU.h rename to setup/xapp-sm-connector/asn1c_defs/E2AP-PDU.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition-Format1.c b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition-Format1.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition-Format1.c rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition-Format1.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition-Format1.h b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition-Format1.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition-Format1.h rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition-Format1.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition.c b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition.c rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition.h b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition.h rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ActionDefinition.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader-Format1.c b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader-Format1.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader-Format1.c rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader-Format1.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader-Format1.h b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader-Format1.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader-Format1.h rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader-Format1.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader.c b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader.c rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader.h b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader.h rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlHeader.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage-Format1.c b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage-Format1.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage-Format1.c rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage-Format1.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage-Format1.h b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage-Format1.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage-Format1.h rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage-Format1.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage.c b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage.c rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage.h b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage.h rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-ControlMessage.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition-Format1.c b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition-Format1.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition-Format1.c rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition-Format1.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition-Format1.h b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition-Format1.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition-Format1.h rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition-Format1.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition.c b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition.c rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition.h b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition.h rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-EventTriggerDefinition.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader-Format1.c b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader-Format1.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader-Format1.c rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader-Format1.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader-Format1.h b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader-Format1.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader-Format1.h rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader-Format1.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader.c b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader.c rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader.h b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader.h rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationHeader.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage-Format1.c b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage-Format1.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage-Format1.c rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage-Format1.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage-Format1.h b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage-Format1.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage-Format1.h rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage-Format1.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage.c b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage.c rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage.h b/setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage.h rename to setup/xapp-sm-connector/asn1c_defs/E2SM-HelloWorld-IndicationMessage.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2setupFailure.c b/setup/xapp-sm-connector/asn1c_defs/E2setupFailure.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2setupFailure.c rename to setup/xapp-sm-connector/asn1c_defs/E2setupFailure.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2setupFailure.h b/setup/xapp-sm-connector/asn1c_defs/E2setupFailure.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2setupFailure.h rename to setup/xapp-sm-connector/asn1c_defs/E2setupFailure.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2setupRequest.c b/setup/xapp-sm-connector/asn1c_defs/E2setupRequest.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2setupRequest.c rename to setup/xapp-sm-connector/asn1c_defs/E2setupRequest.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2setupRequest.h b/setup/xapp-sm-connector/asn1c_defs/E2setupRequest.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2setupRequest.h rename to setup/xapp-sm-connector/asn1c_defs/E2setupRequest.h diff --git a/setup/xapp-bs-connector/asn1c_defs/E2setupResponse.c b/setup/xapp-sm-connector/asn1c_defs/E2setupResponse.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2setupResponse.c rename to setup/xapp-sm-connector/asn1c_defs/E2setupResponse.c diff --git a/setup/xapp-bs-connector/asn1c_defs/E2setupResponse.h b/setup/xapp-sm-connector/asn1c_defs/E2setupResponse.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/E2setupResponse.h rename to setup/xapp-sm-connector/asn1c_defs/E2setupResponse.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ENB-ID-Choice.c b/setup/xapp-sm-connector/asn1c_defs/ENB-ID-Choice.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ENB-ID-Choice.c rename to setup/xapp-sm-connector/asn1c_defs/ENB-ID-Choice.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ENB-ID-Choice.h b/setup/xapp-sm-connector/asn1c_defs/ENB-ID-Choice.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ENB-ID-Choice.h rename to setup/xapp-sm-connector/asn1c_defs/ENB-ID-Choice.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ENB-ID.c b/setup/xapp-sm-connector/asn1c_defs/ENB-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ENB-ID.c rename to setup/xapp-sm-connector/asn1c_defs/ENB-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ENB-ID.h b/setup/xapp-sm-connector/asn1c_defs/ENB-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ENB-ID.h rename to setup/xapp-sm-connector/asn1c_defs/ENB-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ENGNB-ID.c b/setup/xapp-sm-connector/asn1c_defs/ENGNB-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ENGNB-ID.c rename to setup/xapp-sm-connector/asn1c_defs/ENGNB-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ENGNB-ID.h b/setup/xapp-sm-connector/asn1c_defs/ENGNB-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ENGNB-ID.h rename to setup/xapp-sm-connector/asn1c_defs/ENGNB-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ErrorIndication.c b/setup/xapp-sm-connector/asn1c_defs/ErrorIndication.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ErrorIndication.c rename to setup/xapp-sm-connector/asn1c_defs/ErrorIndication.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ErrorIndication.h b/setup/xapp-sm-connector/asn1c_defs/ErrorIndication.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ErrorIndication.h rename to setup/xapp-sm-connector/asn1c_defs/ErrorIndication.h diff --git a/setup/xapp-bs-connector/asn1c_defs/GNB-CU-UP-ID.c b/setup/xapp-sm-connector/asn1c_defs/GNB-CU-UP-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GNB-CU-UP-ID.c rename to setup/xapp-sm-connector/asn1c_defs/GNB-CU-UP-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/GNB-CU-UP-ID.h b/setup/xapp-sm-connector/asn1c_defs/GNB-CU-UP-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GNB-CU-UP-ID.h rename to setup/xapp-sm-connector/asn1c_defs/GNB-CU-UP-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/GNB-DU-ID.c b/setup/xapp-sm-connector/asn1c_defs/GNB-DU-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GNB-DU-ID.c rename to setup/xapp-sm-connector/asn1c_defs/GNB-DU-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/GNB-DU-ID.h b/setup/xapp-sm-connector/asn1c_defs/GNB-DU-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GNB-DU-ID.h rename to setup/xapp-sm-connector/asn1c_defs/GNB-DU-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/GNB-ID-Choice.c b/setup/xapp-sm-connector/asn1c_defs/GNB-ID-Choice.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GNB-ID-Choice.c rename to setup/xapp-sm-connector/asn1c_defs/GNB-ID-Choice.c diff --git a/setup/xapp-bs-connector/asn1c_defs/GNB-ID-Choice.h b/setup/xapp-sm-connector/asn1c_defs/GNB-ID-Choice.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GNB-ID-Choice.h rename to setup/xapp-sm-connector/asn1c_defs/GNB-ID-Choice.h diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalE2node-ID.c b/setup/xapp-sm-connector/asn1c_defs/GlobalE2node-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalE2node-ID.c rename to setup/xapp-sm-connector/asn1c_defs/GlobalE2node-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalE2node-ID.h b/setup/xapp-sm-connector/asn1c_defs/GlobalE2node-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalE2node-ID.h rename to setup/xapp-sm-connector/asn1c_defs/GlobalE2node-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalE2node-eNB-ID.c b/setup/xapp-sm-connector/asn1c_defs/GlobalE2node-eNB-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalE2node-eNB-ID.c rename to setup/xapp-sm-connector/asn1c_defs/GlobalE2node-eNB-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalE2node-eNB-ID.h b/setup/xapp-sm-connector/asn1c_defs/GlobalE2node-eNB-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalE2node-eNB-ID.h rename to setup/xapp-sm-connector/asn1c_defs/GlobalE2node-eNB-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalE2node-en-gNB-ID.c b/setup/xapp-sm-connector/asn1c_defs/GlobalE2node-en-gNB-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalE2node-en-gNB-ID.c rename to setup/xapp-sm-connector/asn1c_defs/GlobalE2node-en-gNB-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalE2node-en-gNB-ID.h b/setup/xapp-sm-connector/asn1c_defs/GlobalE2node-en-gNB-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalE2node-en-gNB-ID.h rename to setup/xapp-sm-connector/asn1c_defs/GlobalE2node-en-gNB-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalE2node-gNB-ID.c b/setup/xapp-sm-connector/asn1c_defs/GlobalE2node-gNB-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalE2node-gNB-ID.c rename to setup/xapp-sm-connector/asn1c_defs/GlobalE2node-gNB-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalE2node-gNB-ID.h b/setup/xapp-sm-connector/asn1c_defs/GlobalE2node-gNB-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalE2node-gNB-ID.h rename to setup/xapp-sm-connector/asn1c_defs/GlobalE2node-gNB-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalE2node-ng-eNB-ID.c b/setup/xapp-sm-connector/asn1c_defs/GlobalE2node-ng-eNB-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalE2node-ng-eNB-ID.c rename to setup/xapp-sm-connector/asn1c_defs/GlobalE2node-ng-eNB-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalE2node-ng-eNB-ID.h b/setup/xapp-sm-connector/asn1c_defs/GlobalE2node-ng-eNB-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalE2node-ng-eNB-ID.h rename to setup/xapp-sm-connector/asn1c_defs/GlobalE2node-ng-eNB-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalENB-ID.c b/setup/xapp-sm-connector/asn1c_defs/GlobalENB-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalENB-ID.c rename to setup/xapp-sm-connector/asn1c_defs/GlobalENB-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalENB-ID.h b/setup/xapp-sm-connector/asn1c_defs/GlobalENB-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalENB-ID.h rename to setup/xapp-sm-connector/asn1c_defs/GlobalENB-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalRIC-ID.c b/setup/xapp-sm-connector/asn1c_defs/GlobalRIC-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalRIC-ID.c rename to setup/xapp-sm-connector/asn1c_defs/GlobalRIC-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalRIC-ID.h b/setup/xapp-sm-connector/asn1c_defs/GlobalRIC-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalRIC-ID.h rename to setup/xapp-sm-connector/asn1c_defs/GlobalRIC-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalenGNB-ID.c b/setup/xapp-sm-connector/asn1c_defs/GlobalenGNB-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalenGNB-ID.c rename to setup/xapp-sm-connector/asn1c_defs/GlobalenGNB-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalenGNB-ID.h b/setup/xapp-sm-connector/asn1c_defs/GlobalenGNB-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalenGNB-ID.h rename to setup/xapp-sm-connector/asn1c_defs/GlobalenGNB-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalgNB-ID.c b/setup/xapp-sm-connector/asn1c_defs/GlobalgNB-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalgNB-ID.c rename to setup/xapp-sm-connector/asn1c_defs/GlobalgNB-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalgNB-ID.h b/setup/xapp-sm-connector/asn1c_defs/GlobalgNB-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalgNB-ID.h rename to setup/xapp-sm-connector/asn1c_defs/GlobalgNB-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalngeNB-ID.c b/setup/xapp-sm-connector/asn1c_defs/GlobalngeNB-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalngeNB-ID.c rename to setup/xapp-sm-connector/asn1c_defs/GlobalngeNB-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/GlobalngeNB-ID.h b/setup/xapp-sm-connector/asn1c_defs/GlobalngeNB-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/GlobalngeNB-ID.h rename to setup/xapp-sm-connector/asn1c_defs/GlobalngeNB-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/HW-ControlCommand.c b/setup/xapp-sm-connector/asn1c_defs/HW-ControlCommand.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/HW-ControlCommand.c rename to setup/xapp-sm-connector/asn1c_defs/HW-ControlCommand.c diff --git a/setup/xapp-bs-connector/asn1c_defs/HW-ControlCommand.h b/setup/xapp-sm-connector/asn1c_defs/HW-ControlCommand.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/HW-ControlCommand.h rename to setup/xapp-sm-connector/asn1c_defs/HW-ControlCommand.h diff --git a/setup/xapp-bs-connector/asn1c_defs/HW-Header.c b/setup/xapp-sm-connector/asn1c_defs/HW-Header.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/HW-Header.c rename to setup/xapp-sm-connector/asn1c_defs/HW-Header.c diff --git a/setup/xapp-bs-connector/asn1c_defs/HW-Header.h b/setup/xapp-sm-connector/asn1c_defs/HW-Header.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/HW-Header.h rename to setup/xapp-sm-connector/asn1c_defs/HW-Header.h diff --git a/setup/xapp-bs-connector/asn1c_defs/HW-Message.c b/setup/xapp-sm-connector/asn1c_defs/HW-Message.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/HW-Message.c rename to setup/xapp-sm-connector/asn1c_defs/HW-Message.c diff --git a/setup/xapp-bs-connector/asn1c_defs/HW-Message.h b/setup/xapp-sm-connector/asn1c_defs/HW-Message.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/HW-Message.h rename to setup/xapp-sm-connector/asn1c_defs/HW-Message.h diff --git a/setup/xapp-bs-connector/asn1c_defs/HW-TriggerNature.c b/setup/xapp-sm-connector/asn1c_defs/HW-TriggerNature.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/HW-TriggerNature.c rename to setup/xapp-sm-connector/asn1c_defs/HW-TriggerNature.c diff --git a/setup/xapp-bs-connector/asn1c_defs/HW-TriggerNature.h b/setup/xapp-sm-connector/asn1c_defs/HW-TriggerNature.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/HW-TriggerNature.h rename to setup/xapp-sm-connector/asn1c_defs/HW-TriggerNature.h diff --git a/setup/xapp-bs-connector/asn1c_defs/INTEGER.c b/setup/xapp-sm-connector/asn1c_defs/INTEGER.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/INTEGER.c rename to setup/xapp-sm-connector/asn1c_defs/INTEGER.c diff --git a/setup/xapp-bs-connector/asn1c_defs/INTEGER.h b/setup/xapp-sm-connector/asn1c_defs/INTEGER.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/INTEGER.h rename to setup/xapp-sm-connector/asn1c_defs/INTEGER.h diff --git a/setup/xapp-bs-connector/asn1c_defs/InitiatingMessage.c b/setup/xapp-sm-connector/asn1c_defs/InitiatingMessage.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/InitiatingMessage.c rename to setup/xapp-sm-connector/asn1c_defs/InitiatingMessage.c diff --git a/setup/xapp-bs-connector/asn1c_defs/InitiatingMessage.h b/setup/xapp-sm-connector/asn1c_defs/InitiatingMessage.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/InitiatingMessage.h rename to setup/xapp-sm-connector/asn1c_defs/InitiatingMessage.h diff --git a/setup/xapp-bs-connector/asn1c_defs/NULL.c b/setup/xapp-sm-connector/asn1c_defs/NULL.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/NULL.c rename to setup/xapp-sm-connector/asn1c_defs/NULL.c diff --git a/setup/xapp-bs-connector/asn1c_defs/NULL.h b/setup/xapp-sm-connector/asn1c_defs/NULL.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/NULL.h rename to setup/xapp-sm-connector/asn1c_defs/NULL.h diff --git a/setup/xapp-bs-connector/asn1c_defs/NativeEnumerated.c b/setup/xapp-sm-connector/asn1c_defs/NativeEnumerated.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/NativeEnumerated.c rename to setup/xapp-sm-connector/asn1c_defs/NativeEnumerated.c diff --git a/setup/xapp-bs-connector/asn1c_defs/NativeEnumerated.h b/setup/xapp-sm-connector/asn1c_defs/NativeEnumerated.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/NativeEnumerated.h rename to setup/xapp-sm-connector/asn1c_defs/NativeEnumerated.h diff --git a/setup/xapp-bs-connector/asn1c_defs/NativeInteger.c b/setup/xapp-sm-connector/asn1c_defs/NativeInteger.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/NativeInteger.c rename to setup/xapp-sm-connector/asn1c_defs/NativeInteger.c diff --git a/setup/xapp-bs-connector/asn1c_defs/NativeInteger.h b/setup/xapp-sm-connector/asn1c_defs/NativeInteger.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/NativeInteger.h rename to setup/xapp-sm-connector/asn1c_defs/NativeInteger.h diff --git a/setup/xapp-bs-connector/asn1c_defs/OBJECT_IDENTIFIER.c b/setup/xapp-sm-connector/asn1c_defs/OBJECT_IDENTIFIER.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/OBJECT_IDENTIFIER.c rename to setup/xapp-sm-connector/asn1c_defs/OBJECT_IDENTIFIER.c diff --git a/setup/xapp-bs-connector/asn1c_defs/OBJECT_IDENTIFIER.h b/setup/xapp-sm-connector/asn1c_defs/OBJECT_IDENTIFIER.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/OBJECT_IDENTIFIER.h rename to setup/xapp-sm-connector/asn1c_defs/OBJECT_IDENTIFIER.h diff --git a/setup/xapp-bs-connector/asn1c_defs/OCTET_STRING.c b/setup/xapp-sm-connector/asn1c_defs/OCTET_STRING.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/OCTET_STRING.c rename to setup/xapp-sm-connector/asn1c_defs/OCTET_STRING.c diff --git a/setup/xapp-bs-connector/asn1c_defs/OCTET_STRING.h b/setup/xapp-sm-connector/asn1c_defs/OCTET_STRING.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/OCTET_STRING.h rename to setup/xapp-sm-connector/asn1c_defs/OCTET_STRING.h diff --git a/setup/xapp-bs-connector/asn1c_defs/OPEN_TYPE.c b/setup/xapp-sm-connector/asn1c_defs/OPEN_TYPE.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/OPEN_TYPE.c rename to setup/xapp-sm-connector/asn1c_defs/OPEN_TYPE.c diff --git a/setup/xapp-bs-connector/asn1c_defs/OPEN_TYPE.h b/setup/xapp-sm-connector/asn1c_defs/OPEN_TYPE.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/OPEN_TYPE.h rename to setup/xapp-sm-connector/asn1c_defs/OPEN_TYPE.h diff --git a/setup/xapp-bs-connector/asn1c_defs/PLMN-Identity.c b/setup/xapp-sm-connector/asn1c_defs/PLMN-Identity.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/PLMN-Identity.c rename to setup/xapp-sm-connector/asn1c_defs/PLMN-Identity.c diff --git a/setup/xapp-bs-connector/asn1c_defs/PLMN-Identity.h b/setup/xapp-sm-connector/asn1c_defs/PLMN-Identity.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/PLMN-Identity.h rename to setup/xapp-sm-connector/asn1c_defs/PLMN-Identity.h diff --git a/setup/xapp-bs-connector/asn1c_defs/Presence.c b/setup/xapp-sm-connector/asn1c_defs/Presence.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/Presence.c rename to setup/xapp-sm-connector/asn1c_defs/Presence.c diff --git a/setup/xapp-bs-connector/asn1c_defs/Presence.h b/setup/xapp-sm-connector/asn1c_defs/Presence.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/Presence.h rename to setup/xapp-sm-connector/asn1c_defs/Presence.h diff --git a/setup/xapp-bs-connector/asn1c_defs/PrintableString.c b/setup/xapp-sm-connector/asn1c_defs/PrintableString.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/PrintableString.c rename to setup/xapp-sm-connector/asn1c_defs/PrintableString.c diff --git a/setup/xapp-bs-connector/asn1c_defs/PrintableString.h b/setup/xapp-sm-connector/asn1c_defs/PrintableString.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/PrintableString.h rename to setup/xapp-sm-connector/asn1c_defs/PrintableString.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ProcedureCode.c b/setup/xapp-sm-connector/asn1c_defs/ProcedureCode.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProcedureCode.c rename to setup/xapp-sm-connector/asn1c_defs/ProcedureCode.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ProcedureCode.h b/setup/xapp-sm-connector/asn1c_defs/ProcedureCode.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProcedureCode.h rename to setup/xapp-sm-connector/asn1c_defs/ProcedureCode.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-Container.c b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-Container.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-Container.c rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-Container.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-Container.h b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-Container.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-Container.h rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-Container.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ContainerList.c b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ContainerList.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ContainerList.c rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ContainerList.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ContainerList.h b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ContainerList.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ContainerList.h rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ContainerList.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ContainerPair.c b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ContainerPair.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ContainerPair.c rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ContainerPair.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ContainerPair.h b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ContainerPair.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ContainerPair.h rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ContainerPair.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ContainerPairList.c b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ContainerPairList.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ContainerPairList.c rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ContainerPairList.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ContainerPairList.h b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ContainerPairList.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ContainerPairList.h rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ContainerPairList.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-Field.c b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-Field.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-Field.c rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-Field.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-Field.h b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-Field.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-Field.h rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-Field.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-FieldPair.c b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-FieldPair.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-FieldPair.c rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-FieldPair.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-FieldPair.h b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-FieldPair.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-FieldPair.h rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-FieldPair.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ID.c b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ID.c rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ID.h b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-ID.h rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-SingleContainer.c b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-SingleContainer.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-SingleContainer.c rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-SingleContainer.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ProtocolIE-SingleContainer.h b/setup/xapp-sm-connector/asn1c_defs/ProtocolIE-SingleContainer.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ProtocolIE-SingleContainer.h rename to setup/xapp-sm-connector/asn1c_defs/ProtocolIE-SingleContainer.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunction-Item.c b/setup/xapp-sm-connector/asn1c_defs/RANfunction-Item.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunction-Item.c rename to setup/xapp-sm-connector/asn1c_defs/RANfunction-Item.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunction-Item.h b/setup/xapp-sm-connector/asn1c_defs/RANfunction-Item.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunction-Item.h rename to setup/xapp-sm-connector/asn1c_defs/RANfunction-Item.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctionDefinition.c b/setup/xapp-sm-connector/asn1c_defs/RANfunctionDefinition.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctionDefinition.c rename to setup/xapp-sm-connector/asn1c_defs/RANfunctionDefinition.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctionDefinition.h b/setup/xapp-sm-connector/asn1c_defs/RANfunctionDefinition.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctionDefinition.h rename to setup/xapp-sm-connector/asn1c_defs/RANfunctionDefinition.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctionID-Item.c b/setup/xapp-sm-connector/asn1c_defs/RANfunctionID-Item.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctionID-Item.c rename to setup/xapp-sm-connector/asn1c_defs/RANfunctionID-Item.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctionID-Item.h b/setup/xapp-sm-connector/asn1c_defs/RANfunctionID-Item.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctionID-Item.h rename to setup/xapp-sm-connector/asn1c_defs/RANfunctionID-Item.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctionID.c b/setup/xapp-sm-connector/asn1c_defs/RANfunctionID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctionID.c rename to setup/xapp-sm-connector/asn1c_defs/RANfunctionID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctionID.h b/setup/xapp-sm-connector/asn1c_defs/RANfunctionID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctionID.h rename to setup/xapp-sm-connector/asn1c_defs/RANfunctionID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctionIDcause-Item.c b/setup/xapp-sm-connector/asn1c_defs/RANfunctionIDcause-Item.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctionIDcause-Item.c rename to setup/xapp-sm-connector/asn1c_defs/RANfunctionIDcause-Item.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctionIDcause-Item.h b/setup/xapp-sm-connector/asn1c_defs/RANfunctionIDcause-Item.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctionIDcause-Item.h rename to setup/xapp-sm-connector/asn1c_defs/RANfunctionIDcause-Item.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctionRevision.c b/setup/xapp-sm-connector/asn1c_defs/RANfunctionRevision.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctionRevision.c rename to setup/xapp-sm-connector/asn1c_defs/RANfunctionRevision.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctionRevision.h b/setup/xapp-sm-connector/asn1c_defs/RANfunctionRevision.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctionRevision.h rename to setup/xapp-sm-connector/asn1c_defs/RANfunctionRevision.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctions-List.c b/setup/xapp-sm-connector/asn1c_defs/RANfunctions-List.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctions-List.c rename to setup/xapp-sm-connector/asn1c_defs/RANfunctions-List.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctions-List.h b/setup/xapp-sm-connector/asn1c_defs/RANfunctions-List.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctions-List.h rename to setup/xapp-sm-connector/asn1c_defs/RANfunctions-List.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctionsID-List.c b/setup/xapp-sm-connector/asn1c_defs/RANfunctionsID-List.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctionsID-List.c rename to setup/xapp-sm-connector/asn1c_defs/RANfunctionsID-List.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctionsID-List.h b/setup/xapp-sm-connector/asn1c_defs/RANfunctionsID-List.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctionsID-List.h rename to setup/xapp-sm-connector/asn1c_defs/RANfunctionsID-List.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctionsIDcause-List.c b/setup/xapp-sm-connector/asn1c_defs/RANfunctionsIDcause-List.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctionsIDcause-List.c rename to setup/xapp-sm-connector/asn1c_defs/RANfunctionsIDcause-List.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RANfunctionsIDcause-List.h b/setup/xapp-sm-connector/asn1c_defs/RANfunctionsIDcause-List.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANfunctionsIDcause-List.h rename to setup/xapp-sm-connector/asn1c_defs/RANfunctionsIDcause-List.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RANparameter-ID.c b/setup/xapp-sm-connector/asn1c_defs/RANparameter-ID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANparameter-ID.c rename to setup/xapp-sm-connector/asn1c_defs/RANparameter-ID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RANparameter-ID.h b/setup/xapp-sm-connector/asn1c_defs/RANparameter-ID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANparameter-ID.h rename to setup/xapp-sm-connector/asn1c_defs/RANparameter-ID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RANparameter-Item.c b/setup/xapp-sm-connector/asn1c_defs/RANparameter-Item.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANparameter-Item.c rename to setup/xapp-sm-connector/asn1c_defs/RANparameter-Item.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RANparameter-Item.h b/setup/xapp-sm-connector/asn1c_defs/RANparameter-Item.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANparameter-Item.h rename to setup/xapp-sm-connector/asn1c_defs/RANparameter-Item.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RANparameter-Name.c b/setup/xapp-sm-connector/asn1c_defs/RANparameter-Name.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANparameter-Name.c rename to setup/xapp-sm-connector/asn1c_defs/RANparameter-Name.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RANparameter-Name.h b/setup/xapp-sm-connector/asn1c_defs/RANparameter-Name.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANparameter-Name.h rename to setup/xapp-sm-connector/asn1c_defs/RANparameter-Name.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RANparameter-Test.c b/setup/xapp-sm-connector/asn1c_defs/RANparameter-Test.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANparameter-Test.c rename to setup/xapp-sm-connector/asn1c_defs/RANparameter-Test.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RANparameter-Test.h b/setup/xapp-sm-connector/asn1c_defs/RANparameter-Test.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANparameter-Test.h rename to setup/xapp-sm-connector/asn1c_defs/RANparameter-Test.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RANparameter-Value.c b/setup/xapp-sm-connector/asn1c_defs/RANparameter-Value.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANparameter-Value.c rename to setup/xapp-sm-connector/asn1c_defs/RANparameter-Value.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RANparameter-Value.h b/setup/xapp-sm-connector/asn1c_defs/RANparameter-Value.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RANparameter-Value.h rename to setup/xapp-sm-connector/asn1c_defs/RANparameter-Value.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICaction-Admitted-Item.c b/setup/xapp-sm-connector/asn1c_defs/RICaction-Admitted-Item.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICaction-Admitted-Item.c rename to setup/xapp-sm-connector/asn1c_defs/RICaction-Admitted-Item.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICaction-Admitted-Item.h b/setup/xapp-sm-connector/asn1c_defs/RICaction-Admitted-Item.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICaction-Admitted-Item.h rename to setup/xapp-sm-connector/asn1c_defs/RICaction-Admitted-Item.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICaction-Admitted-List.c b/setup/xapp-sm-connector/asn1c_defs/RICaction-Admitted-List.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICaction-Admitted-List.c rename to setup/xapp-sm-connector/asn1c_defs/RICaction-Admitted-List.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICaction-Admitted-List.h b/setup/xapp-sm-connector/asn1c_defs/RICaction-Admitted-List.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICaction-Admitted-List.h rename to setup/xapp-sm-connector/asn1c_defs/RICaction-Admitted-List.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICaction-NotAdmitted-Item.c b/setup/xapp-sm-connector/asn1c_defs/RICaction-NotAdmitted-Item.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICaction-NotAdmitted-Item.c rename to setup/xapp-sm-connector/asn1c_defs/RICaction-NotAdmitted-Item.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICaction-NotAdmitted-Item.h b/setup/xapp-sm-connector/asn1c_defs/RICaction-NotAdmitted-Item.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICaction-NotAdmitted-Item.h rename to setup/xapp-sm-connector/asn1c_defs/RICaction-NotAdmitted-Item.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICaction-NotAdmitted-List.c b/setup/xapp-sm-connector/asn1c_defs/RICaction-NotAdmitted-List.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICaction-NotAdmitted-List.c rename to setup/xapp-sm-connector/asn1c_defs/RICaction-NotAdmitted-List.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICaction-NotAdmitted-List.h b/setup/xapp-sm-connector/asn1c_defs/RICaction-NotAdmitted-List.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICaction-NotAdmitted-List.h rename to setup/xapp-sm-connector/asn1c_defs/RICaction-NotAdmitted-List.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICaction-ToBeSetup-Item.c b/setup/xapp-sm-connector/asn1c_defs/RICaction-ToBeSetup-Item.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICaction-ToBeSetup-Item.c rename to setup/xapp-sm-connector/asn1c_defs/RICaction-ToBeSetup-Item.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICaction-ToBeSetup-Item.h b/setup/xapp-sm-connector/asn1c_defs/RICaction-ToBeSetup-Item.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICaction-ToBeSetup-Item.h rename to setup/xapp-sm-connector/asn1c_defs/RICaction-ToBeSetup-Item.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICactionDefinition.c b/setup/xapp-sm-connector/asn1c_defs/RICactionDefinition.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICactionDefinition.c rename to setup/xapp-sm-connector/asn1c_defs/RICactionDefinition.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICactionDefinition.h b/setup/xapp-sm-connector/asn1c_defs/RICactionDefinition.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICactionDefinition.h rename to setup/xapp-sm-connector/asn1c_defs/RICactionDefinition.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICactionID.c b/setup/xapp-sm-connector/asn1c_defs/RICactionID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICactionID.c rename to setup/xapp-sm-connector/asn1c_defs/RICactionID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICactionID.h b/setup/xapp-sm-connector/asn1c_defs/RICactionID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICactionID.h rename to setup/xapp-sm-connector/asn1c_defs/RICactionID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICactionType.c b/setup/xapp-sm-connector/asn1c_defs/RICactionType.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICactionType.c rename to setup/xapp-sm-connector/asn1c_defs/RICactionType.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICactionType.h b/setup/xapp-sm-connector/asn1c_defs/RICactionType.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICactionType.h rename to setup/xapp-sm-connector/asn1c_defs/RICactionType.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICactions-ToBeSetup-List.c b/setup/xapp-sm-connector/asn1c_defs/RICactions-ToBeSetup-List.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICactions-ToBeSetup-List.c rename to setup/xapp-sm-connector/asn1c_defs/RICactions-ToBeSetup-List.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICactions-ToBeSetup-List.h b/setup/xapp-sm-connector/asn1c_defs/RICactions-ToBeSetup-List.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICactions-ToBeSetup-List.h rename to setup/xapp-sm-connector/asn1c_defs/RICactions-ToBeSetup-List.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcallProcessID.c b/setup/xapp-sm-connector/asn1c_defs/RICcallProcessID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcallProcessID.c rename to setup/xapp-sm-connector/asn1c_defs/RICcallProcessID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcallProcessID.h b/setup/xapp-sm-connector/asn1c_defs/RICcallProcessID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcallProcessID.h rename to setup/xapp-sm-connector/asn1c_defs/RICcallProcessID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolAckRequest.c b/setup/xapp-sm-connector/asn1c_defs/RICcontrolAckRequest.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolAckRequest.c rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolAckRequest.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolAckRequest.h b/setup/xapp-sm-connector/asn1c_defs/RICcontrolAckRequest.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolAckRequest.h rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolAckRequest.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolAcknowledge.c b/setup/xapp-sm-connector/asn1c_defs/RICcontrolAcknowledge.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolAcknowledge.c rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolAcknowledge.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolAcknowledge.h b/setup/xapp-sm-connector/asn1c_defs/RICcontrolAcknowledge.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolAcknowledge.h rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolAcknowledge.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolFailure.c b/setup/xapp-sm-connector/asn1c_defs/RICcontrolFailure.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolFailure.c rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolFailure.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolFailure.h b/setup/xapp-sm-connector/asn1c_defs/RICcontrolFailure.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolFailure.h rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolFailure.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolHeader.c b/setup/xapp-sm-connector/asn1c_defs/RICcontrolHeader.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolHeader.c rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolHeader.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolHeader.h b/setup/xapp-sm-connector/asn1c_defs/RICcontrolHeader.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolHeader.h rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolHeader.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolMessage.c b/setup/xapp-sm-connector/asn1c_defs/RICcontrolMessage.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolMessage.c rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolMessage.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolMessage.h b/setup/xapp-sm-connector/asn1c_defs/RICcontrolMessage.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolMessage.h rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolMessage.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolOutcome.c b/setup/xapp-sm-connector/asn1c_defs/RICcontrolOutcome.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolOutcome.c rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolOutcome.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolOutcome.h b/setup/xapp-sm-connector/asn1c_defs/RICcontrolOutcome.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolOutcome.h rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolOutcome.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolRequest.c b/setup/xapp-sm-connector/asn1c_defs/RICcontrolRequest.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolRequest.c rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolRequest.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolRequest.h b/setup/xapp-sm-connector/asn1c_defs/RICcontrolRequest.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolRequest.h rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolRequest.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolStatus.c b/setup/xapp-sm-connector/asn1c_defs/RICcontrolStatus.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolStatus.c rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolStatus.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICcontrolStatus.h b/setup/xapp-sm-connector/asn1c_defs/RICcontrolStatus.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICcontrolStatus.h rename to setup/xapp-sm-connector/asn1c_defs/RICcontrolStatus.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICeventTriggerDefinition.c b/setup/xapp-sm-connector/asn1c_defs/RICeventTriggerDefinition.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICeventTriggerDefinition.c rename to setup/xapp-sm-connector/asn1c_defs/RICeventTriggerDefinition.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICeventTriggerDefinition.h b/setup/xapp-sm-connector/asn1c_defs/RICeventTriggerDefinition.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICeventTriggerDefinition.h rename to setup/xapp-sm-connector/asn1c_defs/RICeventTriggerDefinition.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICindication.c b/setup/xapp-sm-connector/asn1c_defs/RICindication.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICindication.c rename to setup/xapp-sm-connector/asn1c_defs/RICindication.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICindication.h b/setup/xapp-sm-connector/asn1c_defs/RICindication.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICindication.h rename to setup/xapp-sm-connector/asn1c_defs/RICindication.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICindicationHeader.c b/setup/xapp-sm-connector/asn1c_defs/RICindicationHeader.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICindicationHeader.c rename to setup/xapp-sm-connector/asn1c_defs/RICindicationHeader.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICindicationHeader.h b/setup/xapp-sm-connector/asn1c_defs/RICindicationHeader.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICindicationHeader.h rename to setup/xapp-sm-connector/asn1c_defs/RICindicationHeader.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICindicationMessage.c b/setup/xapp-sm-connector/asn1c_defs/RICindicationMessage.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICindicationMessage.c rename to setup/xapp-sm-connector/asn1c_defs/RICindicationMessage.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICindicationMessage.h b/setup/xapp-sm-connector/asn1c_defs/RICindicationMessage.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICindicationMessage.h rename to setup/xapp-sm-connector/asn1c_defs/RICindicationMessage.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICindicationSN.c b/setup/xapp-sm-connector/asn1c_defs/RICindicationSN.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICindicationSN.c rename to setup/xapp-sm-connector/asn1c_defs/RICindicationSN.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICindicationSN.h b/setup/xapp-sm-connector/asn1c_defs/RICindicationSN.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICindicationSN.h rename to setup/xapp-sm-connector/asn1c_defs/RICindicationSN.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICindicationType.c b/setup/xapp-sm-connector/asn1c_defs/RICindicationType.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICindicationType.c rename to setup/xapp-sm-connector/asn1c_defs/RICindicationType.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICindicationType.h b/setup/xapp-sm-connector/asn1c_defs/RICindicationType.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICindicationType.h rename to setup/xapp-sm-connector/asn1c_defs/RICindicationType.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICrequestID.c b/setup/xapp-sm-connector/asn1c_defs/RICrequestID.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICrequestID.c rename to setup/xapp-sm-connector/asn1c_defs/RICrequestID.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICrequestID.h b/setup/xapp-sm-connector/asn1c_defs/RICrequestID.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICrequestID.h rename to setup/xapp-sm-connector/asn1c_defs/RICrequestID.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICserviceQuery.c b/setup/xapp-sm-connector/asn1c_defs/RICserviceQuery.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICserviceQuery.c rename to setup/xapp-sm-connector/asn1c_defs/RICserviceQuery.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICserviceQuery.h b/setup/xapp-sm-connector/asn1c_defs/RICserviceQuery.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICserviceQuery.h rename to setup/xapp-sm-connector/asn1c_defs/RICserviceQuery.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICserviceUpdate.c b/setup/xapp-sm-connector/asn1c_defs/RICserviceUpdate.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICserviceUpdate.c rename to setup/xapp-sm-connector/asn1c_defs/RICserviceUpdate.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICserviceUpdate.h b/setup/xapp-sm-connector/asn1c_defs/RICserviceUpdate.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICserviceUpdate.h rename to setup/xapp-sm-connector/asn1c_defs/RICserviceUpdate.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICserviceUpdateAcknowledge.c b/setup/xapp-sm-connector/asn1c_defs/RICserviceUpdateAcknowledge.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICserviceUpdateAcknowledge.c rename to setup/xapp-sm-connector/asn1c_defs/RICserviceUpdateAcknowledge.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICserviceUpdateAcknowledge.h b/setup/xapp-sm-connector/asn1c_defs/RICserviceUpdateAcknowledge.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICserviceUpdateAcknowledge.h rename to setup/xapp-sm-connector/asn1c_defs/RICserviceUpdateAcknowledge.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICserviceUpdateFailure.c b/setup/xapp-sm-connector/asn1c_defs/RICserviceUpdateFailure.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICserviceUpdateFailure.c rename to setup/xapp-sm-connector/asn1c_defs/RICserviceUpdateFailure.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICserviceUpdateFailure.h b/setup/xapp-sm-connector/asn1c_defs/RICserviceUpdateFailure.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICserviceUpdateFailure.h rename to setup/xapp-sm-connector/asn1c_defs/RICserviceUpdateFailure.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDeleteFailure.c b/setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDeleteFailure.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDeleteFailure.c rename to setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDeleteFailure.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDeleteFailure.h b/setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDeleteFailure.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDeleteFailure.h rename to setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDeleteFailure.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDeleteRequest.c b/setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDeleteRequest.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDeleteRequest.c rename to setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDeleteRequest.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDeleteRequest.h b/setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDeleteRequest.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDeleteRequest.h rename to setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDeleteRequest.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDeleteResponse.c b/setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDeleteResponse.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDeleteResponse.c rename to setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDeleteResponse.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDeleteResponse.h b/setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDeleteResponse.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDeleteResponse.h rename to setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDeleteResponse.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDetails.c b/setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDetails.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDetails.c rename to setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDetails.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDetails.h b/setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDetails.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubscriptionDetails.h rename to setup/xapp-sm-connector/asn1c_defs/RICsubscriptionDetails.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubscriptionFailure.c b/setup/xapp-sm-connector/asn1c_defs/RICsubscriptionFailure.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubscriptionFailure.c rename to setup/xapp-sm-connector/asn1c_defs/RICsubscriptionFailure.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubscriptionFailure.h b/setup/xapp-sm-connector/asn1c_defs/RICsubscriptionFailure.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubscriptionFailure.h rename to setup/xapp-sm-connector/asn1c_defs/RICsubscriptionFailure.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubscriptionRequest.c b/setup/xapp-sm-connector/asn1c_defs/RICsubscriptionRequest.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubscriptionRequest.c rename to setup/xapp-sm-connector/asn1c_defs/RICsubscriptionRequest.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubscriptionRequest.h b/setup/xapp-sm-connector/asn1c_defs/RICsubscriptionRequest.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubscriptionRequest.h rename to setup/xapp-sm-connector/asn1c_defs/RICsubscriptionRequest.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubscriptionResponse.c b/setup/xapp-sm-connector/asn1c_defs/RICsubscriptionResponse.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubscriptionResponse.c rename to setup/xapp-sm-connector/asn1c_defs/RICsubscriptionResponse.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubscriptionResponse.h b/setup/xapp-sm-connector/asn1c_defs/RICsubscriptionResponse.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubscriptionResponse.h rename to setup/xapp-sm-connector/asn1c_defs/RICsubscriptionResponse.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubsequentAction.c b/setup/xapp-sm-connector/asn1c_defs/RICsubsequentAction.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubsequentAction.c rename to setup/xapp-sm-connector/asn1c_defs/RICsubsequentAction.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubsequentAction.h b/setup/xapp-sm-connector/asn1c_defs/RICsubsequentAction.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubsequentAction.h rename to setup/xapp-sm-connector/asn1c_defs/RICsubsequentAction.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubsequentActionType.c b/setup/xapp-sm-connector/asn1c_defs/RICsubsequentActionType.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubsequentActionType.c rename to setup/xapp-sm-connector/asn1c_defs/RICsubsequentActionType.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICsubsequentActionType.h b/setup/xapp-sm-connector/asn1c_defs/RICsubsequentActionType.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICsubsequentActionType.h rename to setup/xapp-sm-connector/asn1c_defs/RICsubsequentActionType.h diff --git a/setup/xapp-bs-connector/asn1c_defs/RICtimeToWait.c b/setup/xapp-sm-connector/asn1c_defs/RICtimeToWait.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICtimeToWait.c rename to setup/xapp-sm-connector/asn1c_defs/RICtimeToWait.c diff --git a/setup/xapp-bs-connector/asn1c_defs/RICtimeToWait.h b/setup/xapp-sm-connector/asn1c_defs/RICtimeToWait.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/RICtimeToWait.h rename to setup/xapp-sm-connector/asn1c_defs/RICtimeToWait.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ResetRequest.c b/setup/xapp-sm-connector/asn1c_defs/ResetRequest.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ResetRequest.c rename to setup/xapp-sm-connector/asn1c_defs/ResetRequest.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ResetRequest.h b/setup/xapp-sm-connector/asn1c_defs/ResetRequest.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ResetRequest.h rename to setup/xapp-sm-connector/asn1c_defs/ResetRequest.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ResetResponse.c b/setup/xapp-sm-connector/asn1c_defs/ResetResponse.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ResetResponse.c rename to setup/xapp-sm-connector/asn1c_defs/ResetResponse.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ResetResponse.h b/setup/xapp-sm-connector/asn1c_defs/ResetResponse.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ResetResponse.h rename to setup/xapp-sm-connector/asn1c_defs/ResetResponse.h diff --git a/setup/xapp-bs-connector/asn1c_defs/SuccessfulOutcome.c b/setup/xapp-sm-connector/asn1c_defs/SuccessfulOutcome.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/SuccessfulOutcome.c rename to setup/xapp-sm-connector/asn1c_defs/SuccessfulOutcome.c diff --git a/setup/xapp-bs-connector/asn1c_defs/SuccessfulOutcome.h b/setup/xapp-sm-connector/asn1c_defs/SuccessfulOutcome.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/SuccessfulOutcome.h rename to setup/xapp-sm-connector/asn1c_defs/SuccessfulOutcome.h diff --git a/setup/xapp-bs-connector/asn1c_defs/TimeToWait.c b/setup/xapp-sm-connector/asn1c_defs/TimeToWait.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/TimeToWait.c rename to setup/xapp-sm-connector/asn1c_defs/TimeToWait.c diff --git a/setup/xapp-bs-connector/asn1c_defs/TimeToWait.h b/setup/xapp-sm-connector/asn1c_defs/TimeToWait.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/TimeToWait.h rename to setup/xapp-sm-connector/asn1c_defs/TimeToWait.h diff --git a/setup/xapp-bs-connector/asn1c_defs/TriggeringMessage.c b/setup/xapp-sm-connector/asn1c_defs/TriggeringMessage.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/TriggeringMessage.c rename to setup/xapp-sm-connector/asn1c_defs/TriggeringMessage.c diff --git a/setup/xapp-bs-connector/asn1c_defs/TriggeringMessage.h b/setup/xapp-sm-connector/asn1c_defs/TriggeringMessage.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/TriggeringMessage.h rename to setup/xapp-sm-connector/asn1c_defs/TriggeringMessage.h diff --git a/setup/xapp-bs-connector/asn1c_defs/TypeOfError.c b/setup/xapp-sm-connector/asn1c_defs/TypeOfError.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/TypeOfError.c rename to setup/xapp-sm-connector/asn1c_defs/TypeOfError.c diff --git a/setup/xapp-bs-connector/asn1c_defs/TypeOfError.h b/setup/xapp-sm-connector/asn1c_defs/TypeOfError.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/TypeOfError.h rename to setup/xapp-sm-connector/asn1c_defs/TypeOfError.h diff --git a/setup/xapp-bs-connector/asn1c_defs/UnsuccessfulOutcome.c b/setup/xapp-sm-connector/asn1c_defs/UnsuccessfulOutcome.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/UnsuccessfulOutcome.c rename to setup/xapp-sm-connector/asn1c_defs/UnsuccessfulOutcome.c diff --git a/setup/xapp-bs-connector/asn1c_defs/UnsuccessfulOutcome.h b/setup/xapp-sm-connector/asn1c_defs/UnsuccessfulOutcome.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/UnsuccessfulOutcome.h rename to setup/xapp-sm-connector/asn1c_defs/UnsuccessfulOutcome.h diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_SEQUENCE_OF.c b/setup/xapp-sm-connector/asn1c_defs/asn_SEQUENCE_OF.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_SEQUENCE_OF.c rename to setup/xapp-sm-connector/asn1c_defs/asn_SEQUENCE_OF.c diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_SEQUENCE_OF.h b/setup/xapp-sm-connector/asn1c_defs/asn_SEQUENCE_OF.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_SEQUENCE_OF.h rename to setup/xapp-sm-connector/asn1c_defs/asn_SEQUENCE_OF.h diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_SET_OF.c b/setup/xapp-sm-connector/asn1c_defs/asn_SET_OF.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_SET_OF.c rename to setup/xapp-sm-connector/asn1c_defs/asn_SET_OF.c diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_SET_OF.h b/setup/xapp-sm-connector/asn1c_defs/asn_SET_OF.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_SET_OF.h rename to setup/xapp-sm-connector/asn1c_defs/asn_SET_OF.h diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_application.c b/setup/xapp-sm-connector/asn1c_defs/asn_application.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_application.c rename to setup/xapp-sm-connector/asn1c_defs/asn_application.c diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_application.h b/setup/xapp-sm-connector/asn1c_defs/asn_application.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_application.h rename to setup/xapp-sm-connector/asn1c_defs/asn_application.h diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_bit_data.c b/setup/xapp-sm-connector/asn1c_defs/asn_bit_data.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_bit_data.c rename to setup/xapp-sm-connector/asn1c_defs/asn_bit_data.c diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_bit_data.h b/setup/xapp-sm-connector/asn1c_defs/asn_bit_data.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_bit_data.h rename to setup/xapp-sm-connector/asn1c_defs/asn_bit_data.h diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_codecs.h b/setup/xapp-sm-connector/asn1c_defs/asn_codecs.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_codecs.h rename to setup/xapp-sm-connector/asn1c_defs/asn_codecs.h diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_codecs_prim.c b/setup/xapp-sm-connector/asn1c_defs/asn_codecs_prim.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_codecs_prim.c rename to setup/xapp-sm-connector/asn1c_defs/asn_codecs_prim.c diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_codecs_prim.h b/setup/xapp-sm-connector/asn1c_defs/asn_codecs_prim.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_codecs_prim.h rename to setup/xapp-sm-connector/asn1c_defs/asn_codecs_prim.h diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_constant.h b/setup/xapp-sm-connector/asn1c_defs/asn_constant.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_constant.h rename to setup/xapp-sm-connector/asn1c_defs/asn_constant.h diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_internal.c b/setup/xapp-sm-connector/asn1c_defs/asn_internal.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_internal.c rename to setup/xapp-sm-connector/asn1c_defs/asn_internal.c diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_internal.h b/setup/xapp-sm-connector/asn1c_defs/asn_internal.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_internal.h rename to setup/xapp-sm-connector/asn1c_defs/asn_internal.h diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_ioc.h b/setup/xapp-sm-connector/asn1c_defs/asn_ioc.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_ioc.h rename to setup/xapp-sm-connector/asn1c_defs/asn_ioc.h diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_random_fill.c b/setup/xapp-sm-connector/asn1c_defs/asn_random_fill.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_random_fill.c rename to setup/xapp-sm-connector/asn1c_defs/asn_random_fill.c diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_random_fill.h b/setup/xapp-sm-connector/asn1c_defs/asn_random_fill.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_random_fill.h rename to setup/xapp-sm-connector/asn1c_defs/asn_random_fill.h diff --git a/setup/xapp-bs-connector/asn1c_defs/asn_system.h b/setup/xapp-sm-connector/asn1c_defs/asn_system.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/asn_system.h rename to setup/xapp-sm-connector/asn1c_defs/asn_system.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ber_decoder.c b/setup/xapp-sm-connector/asn1c_defs/ber_decoder.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ber_decoder.c rename to setup/xapp-sm-connector/asn1c_defs/ber_decoder.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ber_decoder.h b/setup/xapp-sm-connector/asn1c_defs/ber_decoder.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ber_decoder.h rename to setup/xapp-sm-connector/asn1c_defs/ber_decoder.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ber_tlv_length.c b/setup/xapp-sm-connector/asn1c_defs/ber_tlv_length.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ber_tlv_length.c rename to setup/xapp-sm-connector/asn1c_defs/ber_tlv_length.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ber_tlv_length.h b/setup/xapp-sm-connector/asn1c_defs/ber_tlv_length.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ber_tlv_length.h rename to setup/xapp-sm-connector/asn1c_defs/ber_tlv_length.h diff --git a/setup/xapp-bs-connector/asn1c_defs/ber_tlv_tag.c b/setup/xapp-sm-connector/asn1c_defs/ber_tlv_tag.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ber_tlv_tag.c rename to setup/xapp-sm-connector/asn1c_defs/ber_tlv_tag.c diff --git a/setup/xapp-bs-connector/asn1c_defs/ber_tlv_tag.h b/setup/xapp-sm-connector/asn1c_defs/ber_tlv_tag.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/ber_tlv_tag.h rename to setup/xapp-sm-connector/asn1c_defs/ber_tlv_tag.h diff --git a/setup/xapp-bs-connector/asn1c_defs/constr_CHOICE.c b/setup/xapp-sm-connector/asn1c_defs/constr_CHOICE.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/constr_CHOICE.c rename to setup/xapp-sm-connector/asn1c_defs/constr_CHOICE.c diff --git a/setup/xapp-bs-connector/asn1c_defs/constr_CHOICE.h b/setup/xapp-sm-connector/asn1c_defs/constr_CHOICE.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/constr_CHOICE.h rename to setup/xapp-sm-connector/asn1c_defs/constr_CHOICE.h diff --git a/setup/xapp-bs-connector/asn1c_defs/constr_SEQUENCE.c b/setup/xapp-sm-connector/asn1c_defs/constr_SEQUENCE.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/constr_SEQUENCE.c rename to setup/xapp-sm-connector/asn1c_defs/constr_SEQUENCE.c diff --git a/setup/xapp-bs-connector/asn1c_defs/constr_SEQUENCE.h b/setup/xapp-sm-connector/asn1c_defs/constr_SEQUENCE.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/constr_SEQUENCE.h rename to setup/xapp-sm-connector/asn1c_defs/constr_SEQUENCE.h diff --git a/setup/xapp-bs-connector/asn1c_defs/constr_SEQUENCE_OF.c b/setup/xapp-sm-connector/asn1c_defs/constr_SEQUENCE_OF.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/constr_SEQUENCE_OF.c rename to setup/xapp-sm-connector/asn1c_defs/constr_SEQUENCE_OF.c diff --git a/setup/xapp-bs-connector/asn1c_defs/constr_SEQUENCE_OF.h b/setup/xapp-sm-connector/asn1c_defs/constr_SEQUENCE_OF.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/constr_SEQUENCE_OF.h rename to setup/xapp-sm-connector/asn1c_defs/constr_SEQUENCE_OF.h diff --git a/setup/xapp-bs-connector/asn1c_defs/constr_SET_OF.c b/setup/xapp-sm-connector/asn1c_defs/constr_SET_OF.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/constr_SET_OF.c rename to setup/xapp-sm-connector/asn1c_defs/constr_SET_OF.c diff --git a/setup/xapp-bs-connector/asn1c_defs/constr_SET_OF.h b/setup/xapp-sm-connector/asn1c_defs/constr_SET_OF.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/constr_SET_OF.h rename to setup/xapp-sm-connector/asn1c_defs/constr_SET_OF.h diff --git a/setup/xapp-bs-connector/asn1c_defs/constr_TYPE.c b/setup/xapp-sm-connector/asn1c_defs/constr_TYPE.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/constr_TYPE.c rename to setup/xapp-sm-connector/asn1c_defs/constr_TYPE.c diff --git a/setup/xapp-bs-connector/asn1c_defs/constr_TYPE.h b/setup/xapp-sm-connector/asn1c_defs/constr_TYPE.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/constr_TYPE.h rename to setup/xapp-sm-connector/asn1c_defs/constr_TYPE.h diff --git a/setup/xapp-bs-connector/asn1c_defs/constraints.c b/setup/xapp-sm-connector/asn1c_defs/constraints.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/constraints.c rename to setup/xapp-sm-connector/asn1c_defs/constraints.c diff --git a/setup/xapp-bs-connector/asn1c_defs/constraints.h b/setup/xapp-sm-connector/asn1c_defs/constraints.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/constraints.h rename to setup/xapp-sm-connector/asn1c_defs/constraints.h diff --git a/setup/xapp-bs-connector/asn1c_defs/der_encoder.c b/setup/xapp-sm-connector/asn1c_defs/der_encoder.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/der_encoder.c rename to setup/xapp-sm-connector/asn1c_defs/der_encoder.c diff --git a/setup/xapp-bs-connector/asn1c_defs/der_encoder.h b/setup/xapp-sm-connector/asn1c_defs/der_encoder.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/der_encoder.h rename to setup/xapp-sm-connector/asn1c_defs/der_encoder.h diff --git a/setup/xapp-bs-connector/asn1c_defs/pdu_collection.c b/setup/xapp-sm-connector/asn1c_defs/pdu_collection.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/pdu_collection.c rename to setup/xapp-sm-connector/asn1c_defs/pdu_collection.c diff --git a/setup/xapp-bs-connector/asn1c_defs/per_decoder.c b/setup/xapp-sm-connector/asn1c_defs/per_decoder.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/per_decoder.c rename to setup/xapp-sm-connector/asn1c_defs/per_decoder.c diff --git a/setup/xapp-bs-connector/asn1c_defs/per_decoder.h b/setup/xapp-sm-connector/asn1c_defs/per_decoder.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/per_decoder.h rename to setup/xapp-sm-connector/asn1c_defs/per_decoder.h diff --git a/setup/xapp-bs-connector/asn1c_defs/per_encoder.c b/setup/xapp-sm-connector/asn1c_defs/per_encoder.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/per_encoder.c rename to setup/xapp-sm-connector/asn1c_defs/per_encoder.c diff --git a/setup/xapp-bs-connector/asn1c_defs/per_encoder.h b/setup/xapp-sm-connector/asn1c_defs/per_encoder.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/per_encoder.h rename to setup/xapp-sm-connector/asn1c_defs/per_encoder.h diff --git a/setup/xapp-bs-connector/asn1c_defs/per_opentype.c b/setup/xapp-sm-connector/asn1c_defs/per_opentype.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/per_opentype.c rename to setup/xapp-sm-connector/asn1c_defs/per_opentype.c diff --git a/setup/xapp-bs-connector/asn1c_defs/per_opentype.h b/setup/xapp-sm-connector/asn1c_defs/per_opentype.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/per_opentype.h rename to setup/xapp-sm-connector/asn1c_defs/per_opentype.h diff --git a/setup/xapp-bs-connector/asn1c_defs/per_support.c b/setup/xapp-sm-connector/asn1c_defs/per_support.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/per_support.c rename to setup/xapp-sm-connector/asn1c_defs/per_support.c diff --git a/setup/xapp-bs-connector/asn1c_defs/per_support.h b/setup/xapp-sm-connector/asn1c_defs/per_support.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/per_support.h rename to setup/xapp-sm-connector/asn1c_defs/per_support.h diff --git a/setup/xapp-bs-connector/asn1c_defs/xer_decoder.c b/setup/xapp-sm-connector/asn1c_defs/xer_decoder.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/xer_decoder.c rename to setup/xapp-sm-connector/asn1c_defs/xer_decoder.c diff --git a/setup/xapp-bs-connector/asn1c_defs/xer_decoder.h b/setup/xapp-sm-connector/asn1c_defs/xer_decoder.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/xer_decoder.h rename to setup/xapp-sm-connector/asn1c_defs/xer_decoder.h diff --git a/setup/xapp-bs-connector/asn1c_defs/xer_encoder.c b/setup/xapp-sm-connector/asn1c_defs/xer_encoder.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/xer_encoder.c rename to setup/xapp-sm-connector/asn1c_defs/xer_encoder.c diff --git a/setup/xapp-bs-connector/asn1c_defs/xer_encoder.h b/setup/xapp-sm-connector/asn1c_defs/xer_encoder.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/xer_encoder.h rename to setup/xapp-sm-connector/asn1c_defs/xer_encoder.h diff --git a/setup/xapp-bs-connector/asn1c_defs/xer_support.c b/setup/xapp-sm-connector/asn1c_defs/xer_support.c similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/xer_support.c rename to setup/xapp-sm-connector/asn1c_defs/xer_support.c diff --git a/setup/xapp-bs-connector/asn1c_defs/xer_support.h b/setup/xapp-sm-connector/asn1c_defs/xer_support.h similarity index 100% rename from setup/xapp-bs-connector/asn1c_defs/xer_support.h rename to setup/xapp-sm-connector/asn1c_defs/xer_support.h diff --git a/setup/xapp-bs-connector/build_xapp.sh b/setup/xapp-sm-connector/build_xapp.sh similarity index 94% rename from setup/xapp-bs-connector/build_xapp.sh rename to setup/xapp-sm-connector/build_xapp.sh index 2c6b93a..0b209fd 100755 --- a/setup/xapp-bs-connector/build_xapp.sh +++ b/setup/xapp-sm-connector/build_xapp.sh @@ -1,7 +1,7 @@ #!/bin/bash export DEBUG=0 -export CONNECTOR_DIR=/home/xapp-bs-connector +export CONNECTOR_DIR=/home/xapp-sm-connector # these are replaced through the dockerfile export GNB_ID diff --git a/setup/xapp-bs-connector/container-tag.yaml b/setup/xapp-sm-connector/container-tag.yaml similarity index 100% rename from setup/xapp-bs-connector/container-tag.yaml rename to setup/xapp-sm-connector/container-tag.yaml diff --git a/setup/xapp-bs-connector/docs/_static/logo.png b/setup/xapp-sm-connector/docs/_static/logo.png similarity index 100% rename from setup/xapp-bs-connector/docs/_static/logo.png rename to setup/xapp-sm-connector/docs/_static/logo.png diff --git a/setup/xapp-bs-connector/docs/conf.py b/setup/xapp-sm-connector/docs/conf.py similarity index 100% rename from setup/xapp-bs-connector/docs/conf.py rename to setup/xapp-sm-connector/docs/conf.py diff --git a/setup/xapp-bs-connector/docs/conf.yaml b/setup/xapp-sm-connector/docs/conf.yaml similarity index 100% rename from setup/xapp-bs-connector/docs/conf.yaml rename to setup/xapp-sm-connector/docs/conf.yaml diff --git a/setup/xapp-bs-connector/docs/e2sm-HelloWorld-v001.asn b/setup/xapp-sm-connector/docs/e2sm-HelloWorld-v001.asn similarity index 100% rename from setup/xapp-bs-connector/docs/e2sm-HelloWorld-v001.asn rename to setup/xapp-sm-connector/docs/e2sm-HelloWorld-v001.asn diff --git a/setup/xapp-bs-connector/docs/favicon.ico b/setup/xapp-sm-connector/docs/favicon.ico similarity index 100% rename from setup/xapp-bs-connector/docs/favicon.ico rename to setup/xapp-sm-connector/docs/favicon.ico diff --git a/setup/xapp-bs-connector/docs/index.rst b/setup/xapp-sm-connector/docs/index.rst similarity index 100% rename from setup/xapp-bs-connector/docs/index.rst rename to setup/xapp-sm-connector/docs/index.rst diff --git a/setup/xapp-bs-connector/docs/installation-guide.rst b/setup/xapp-sm-connector/docs/installation-guide.rst similarity index 100% rename from setup/xapp-bs-connector/docs/installation-guide.rst rename to setup/xapp-sm-connector/docs/installation-guide.rst diff --git a/setup/xapp-bs-connector/docs/overview.rst b/setup/xapp-sm-connector/docs/overview.rst similarity index 100% rename from setup/xapp-bs-connector/docs/overview.rst rename to setup/xapp-sm-connector/docs/overview.rst diff --git a/setup/xapp-bs-connector/docs/release-notes.rst b/setup/xapp-sm-connector/docs/release-notes.rst similarity index 100% rename from setup/xapp-bs-connector/docs/release-notes.rst rename to setup/xapp-sm-connector/docs/release-notes.rst diff --git a/setup/xapp-bs-connector/docs/requirements-docs.txt b/setup/xapp-sm-connector/docs/requirements-docs.txt similarity index 100% rename from setup/xapp-bs-connector/docs/requirements-docs.txt rename to setup/xapp-sm-connector/docs/requirements-docs.txt diff --git a/setup/xapp-bs-connector/docs/user-guide.rst b/setup/xapp-sm-connector/docs/user-guide.rst similarity index 100% rename from setup/xapp-bs-connector/docs/user-guide.rst rename to setup/xapp-sm-connector/docs/user-guide.rst diff --git a/setup/xapp-bs-connector/external_socket_tester.py b/setup/xapp-sm-connector/external_socket_tester.py similarity index 100% rename from setup/xapp-bs-connector/external_socket_tester.py rename to setup/xapp-sm-connector/external_socket_tester.py diff --git a/setup/xapp-bs-connector/init/config-file.json b/setup/xapp-sm-connector/init/config-file.json similarity index 100% rename from setup/xapp-bs-connector/init/config-file.json rename to setup/xapp-sm-connector/init/config-file.json diff --git a/setup/xapp-bs-connector/init/init_script.py b/setup/xapp-sm-connector/init/init_script.py similarity index 100% rename from setup/xapp-bs-connector/init/init_script.py rename to setup/xapp-sm-connector/init/init_script.py diff --git a/setup/xapp-bs-connector/init/routes.txt b/setup/xapp-sm-connector/init/routes.txt similarity index 100% rename from setup/xapp-bs-connector/init/routes.txt rename to setup/xapp-sm-connector/init/routes.txt diff --git a/setup/xapp-bs-connector/init/schema.json b/setup/xapp-sm-connector/init/schema.json similarity index 100% rename from setup/xapp-bs-connector/init/schema.json rename to setup/xapp-sm-connector/init/schema.json diff --git a/setup/xapp-bs-connector/releases/container-release-app_hw.yaml b/setup/xapp-sm-connector/releases/container-release-app_hw.yaml similarity index 100% rename from setup/xapp-bs-connector/releases/container-release-app_hw.yaml rename to setup/xapp-sm-connector/releases/container-release-app_hw.yaml diff --git a/setup/xapp-bs-connector/rmr-version.yaml b/setup/xapp-sm-connector/rmr-version.yaml similarity index 100% rename from setup/xapp-bs-connector/rmr-version.yaml rename to setup/xapp-sm-connector/rmr-version.yaml diff --git a/setup/xapp-sm-connector/run_xapp.sh b/setup/xapp-sm-connector/run_xapp.sh new file mode 100755 index 0000000..19f4429 --- /dev/null +++ b/setup/xapp-sm-connector/run_xapp.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +cd /home/xapp-sm-connector/init/ && python3 init_script.py config-file.json diff --git a/setup/xapp-bs-connector/schemas/hwxapp-policy.json b/setup/xapp-sm-connector/schemas/hwxapp-policy.json similarity index 100% rename from setup/xapp-bs-connector/schemas/hwxapp-policy.json rename to setup/xapp-sm-connector/schemas/hwxapp-policy.json diff --git a/setup/xapp-bs-connector/schemas/hwxapp-ves.json b/setup/xapp-sm-connector/schemas/hwxapp-ves.json similarity index 100% rename from setup/xapp-bs-connector/schemas/hwxapp-ves.json rename to setup/xapp-sm-connector/schemas/hwxapp-ves.json diff --git a/setup/xapp-bs-connector/src/.routes.txt.swp b/setup/xapp-sm-connector/src/.routes.txt.swp similarity index 100% rename from setup/xapp-bs-connector/src/.routes.txt.swp rename to setup/xapp-sm-connector/src/.routes.txt.swp diff --git a/setup/xapp-bs-connector/src/Makefile b/setup/xapp-sm-connector/src/Makefile similarity index 100% rename from setup/xapp-bs-connector/src/Makefile rename to setup/xapp-sm-connector/src/Makefile diff --git a/setup/xapp-bs-connector/src/README b/setup/xapp-sm-connector/src/README similarity index 100% rename from setup/xapp-bs-connector/src/README rename to setup/xapp-sm-connector/src/README diff --git a/setup/xapp-bs-connector/src/agent_connector.cc b/setup/xapp-sm-connector/src/agent_connector.cc similarity index 100% rename from setup/xapp-bs-connector/src/agent_connector.cc rename to setup/xapp-sm-connector/src/agent_connector.cc diff --git a/setup/xapp-bs-connector/src/agent_connector.hpp b/setup/xapp-sm-connector/src/agent_connector.hpp similarity index 100% rename from setup/xapp-bs-connector/src/agent_connector.hpp rename to setup/xapp-sm-connector/src/agent_connector.hpp diff --git a/setup/xapp-bs-connector/src/hw_xapp_main.cc b/setup/xapp-sm-connector/src/hw_xapp_main.cc similarity index 100% rename from setup/xapp-bs-connector/src/hw_xapp_main.cc rename to setup/xapp-sm-connector/src/hw_xapp_main.cc diff --git a/setup/xapp-bs-connector/src/routes.txt b/setup/xapp-sm-connector/src/routes.txt similarity index 100% rename from setup/xapp-bs-connector/src/routes.txt rename to setup/xapp-sm-connector/src/routes.txt diff --git a/setup/xapp-bs-connector/src/run_xapp.sh b/setup/xapp-sm-connector/src/run_xapp.sh similarity index 100% rename from setup/xapp-bs-connector/src/run_xapp.sh rename to setup/xapp-sm-connector/src/run_xapp.sh diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_control.cc b/setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_control.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_control.cc rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_control.cc diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_control.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_control.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_control.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_control.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_control_helper.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_control_helper.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_control_helper.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_control_helper.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_control_response.cc b/setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_control_response.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_control_response.cc rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_control_response.cc diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_control_response.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_control_response.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_control_response.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_control_response.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_indication.cc b/setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_indication.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_indication.cc rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_indication.cc diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_indication.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_indication.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_indication.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_indication.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_indication_helper.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_indication_helper.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/e2ap_indication_helper.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/e2ap_indication_helper.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/generic_helpers.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2ap/generic_helpers.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/generic_helpers.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/generic_helpers.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/response_helper.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2ap/response_helper.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/response_helper.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/response_helper.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_delete_request.cc b/setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_delete_request.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_delete_request.cc rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_delete_request.cc diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_delete_request.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_delete_request.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_delete_request.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_delete_request.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_delete_response.cc b/setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_delete_response.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_delete_response.cc rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_delete_response.cc diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_delete_response.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_delete_response.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_delete_response.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_delete_response.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_helper.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_helper.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_helper.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_helper.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_request.cc b/setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_request.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_request.cc rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_request.cc diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_request.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_request.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_request.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_request.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_response.cc b/setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_response.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_response.cc rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_response.cc diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_response.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_response.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2ap/subscription_response.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2ap/subscription_response.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2sm/e2sm_control.cc b/setup/xapp-sm-connector/src/xapp-asn/e2sm/e2sm_control.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2sm/e2sm_control.cc rename to setup/xapp-sm-connector/src/xapp-asn/e2sm/e2sm_control.cc diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2sm/e2sm_control.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2sm/e2sm_control.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2sm/e2sm_control.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2sm/e2sm_control.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2sm/e2sm_helpers.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2sm/e2sm_helpers.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2sm/e2sm_helpers.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2sm/e2sm_helpers.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2sm/e2sm_indication.cc b/setup/xapp-sm-connector/src/xapp-asn/e2sm/e2sm_indication.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2sm/e2sm_indication.cc rename to setup/xapp-sm-connector/src/xapp-asn/e2sm/e2sm_indication.cc diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2sm/e2sm_indication.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2sm/e2sm_indication.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2sm/e2sm_indication.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2sm/e2sm_indication.hpp diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2sm/e2sm_subscription.cc b/setup/xapp-sm-connector/src/xapp-asn/e2sm/e2sm_subscription.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2sm/e2sm_subscription.cc rename to setup/xapp-sm-connector/src/xapp-asn/e2sm/e2sm_subscription.cc diff --git a/setup/xapp-bs-connector/src/xapp-asn/e2sm/e2sm_subscription.hpp b/setup/xapp-sm-connector/src/xapp-asn/e2sm/e2sm_subscription.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-asn/e2sm/e2sm_subscription.hpp rename to setup/xapp-sm-connector/src/xapp-asn/e2sm/e2sm_subscription.hpp diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_control.cc b/setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_control.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_control.cc rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_control.cc diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_control.hpp b/setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_control.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_control.hpp rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_control.hpp diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_control_helper.hpp b/setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_control_helper.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_control_helper.hpp rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_control_helper.hpp diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_control_response.cc b/setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_control_response.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_control_response.cc rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_control_response.cc diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_control_response.hpp b/setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_control_response.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_control_response.hpp rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_control_response.hpp diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_indication.cc b/setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_indication.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_indication.cc rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_indication.cc diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_indication.hpp b/setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_indication.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_indication.hpp rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_indication.hpp diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_indication_helper.hpp b/setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_indication_helper.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/e2ap_indication_helper.hpp rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/e2ap_indication_helper.hpp diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/generic_helpers.hpp b/setup/xapp-sm-connector/src/xapp-formats/e2ap/generic_helpers.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/generic_helpers.hpp rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/generic_helpers.hpp diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/response_helper.hpp b/setup/xapp-sm-connector/src/xapp-formats/e2ap/response_helper.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/response_helper.hpp rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/response_helper.hpp diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_delete_request.cc b/setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_delete_request.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_delete_request.cc rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_delete_request.cc diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_delete_request.hpp b/setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_delete_request.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_delete_request.hpp rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_delete_request.hpp diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_delete_response.cc b/setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_delete_response.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_delete_response.cc rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_delete_response.cc diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_delete_response.hpp b/setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_delete_response.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_delete_response.hpp rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_delete_response.hpp diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_helper.hpp b/setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_helper.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_helper.hpp rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_helper.hpp diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_request.cc b/setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_request.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_request.cc rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_request.cc diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_request.hpp b/setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_request.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_request.hpp rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_request.hpp diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_response.cc b/setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_response.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_response.cc rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_response.cc diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_response.hpp b/setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_response.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2ap/subscription_response.hpp rename to setup/xapp-sm-connector/src/xapp-formats/e2ap/subscription_response.hpp diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2sm/e2sm.cc b/setup/xapp-sm-connector/src/xapp-formats/e2sm/e2sm.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2sm/e2sm.cc rename to setup/xapp-sm-connector/src/xapp-formats/e2sm/e2sm.cc diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2sm/e2sm.hpp b/setup/xapp-sm-connector/src/xapp-formats/e2sm/e2sm.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2sm/e2sm.hpp rename to setup/xapp-sm-connector/src/xapp-formats/e2sm/e2sm.hpp diff --git a/setup/xapp-bs-connector/src/xapp-formats/e2sm/e2sm_helpers.hpp b/setup/xapp-sm-connector/src/xapp-formats/e2sm/e2sm_helpers.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-formats/e2sm/e2sm_helpers.hpp rename to setup/xapp-sm-connector/src/xapp-formats/e2sm/e2sm_helpers.hpp diff --git a/setup/xapp-bs-connector/src/xapp-mgmt/a1_helper.hpp b/setup/xapp-sm-connector/src/xapp-mgmt/a1_helper.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-mgmt/a1_helper.hpp rename to setup/xapp-sm-connector/src/xapp-mgmt/a1_helper.hpp diff --git a/setup/xapp-bs-connector/src/xapp-mgmt/format_helper.hpp b/setup/xapp-sm-connector/src/xapp-mgmt/format_helper.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-mgmt/format_helper.hpp rename to setup/xapp-sm-connector/src/xapp-mgmt/format_helper.hpp diff --git a/setup/xapp-bs-connector/src/xapp-mgmt/msgs_proc.cc b/setup/xapp-sm-connector/src/xapp-mgmt/msgs_proc.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-mgmt/msgs_proc.cc rename to setup/xapp-sm-connector/src/xapp-mgmt/msgs_proc.cc diff --git a/setup/xapp-bs-connector/src/xapp-mgmt/msgs_proc.hpp b/setup/xapp-sm-connector/src/xapp-mgmt/msgs_proc.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-mgmt/msgs_proc.hpp rename to setup/xapp-sm-connector/src/xapp-mgmt/msgs_proc.hpp diff --git a/setup/xapp-bs-connector/src/xapp-mgmt/subs_mgmt.cc b/setup/xapp-sm-connector/src/xapp-mgmt/subs_mgmt.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-mgmt/subs_mgmt.cc rename to setup/xapp-sm-connector/src/xapp-mgmt/subs_mgmt.cc diff --git a/setup/xapp-bs-connector/src/xapp-mgmt/subs_mgmt.hpp b/setup/xapp-sm-connector/src/xapp-mgmt/subs_mgmt.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-mgmt/subs_mgmt.hpp rename to setup/xapp-sm-connector/src/xapp-mgmt/subs_mgmt.hpp diff --git a/setup/xapp-bs-connector/src/xapp-mgmt/xapp_handler.hpp b/setup/xapp-sm-connector/src/xapp-mgmt/xapp_handler.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-mgmt/xapp_handler.hpp rename to setup/xapp-sm-connector/src/xapp-mgmt/xapp_handler.hpp diff --git a/setup/xapp-bs-connector/src/xapp-utils/xapp_config.cc b/setup/xapp-sm-connector/src/xapp-utils/xapp_config.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-utils/xapp_config.cc rename to setup/xapp-sm-connector/src/xapp-utils/xapp_config.cc diff --git a/setup/xapp-bs-connector/src/xapp-utils/xapp_config.hpp b/setup/xapp-sm-connector/src/xapp-utils/xapp_config.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-utils/xapp_config.hpp rename to setup/xapp-sm-connector/src/xapp-utils/xapp_config.hpp diff --git a/setup/xapp-bs-connector/src/xapp-utils/xapp_rmr.cc b/setup/xapp-sm-connector/src/xapp-utils/xapp_rmr.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-utils/xapp_rmr.cc rename to setup/xapp-sm-connector/src/xapp-utils/xapp_rmr.cc diff --git a/setup/xapp-bs-connector/src/xapp-utils/xapp_rmr.hpp b/setup/xapp-sm-connector/src/xapp-utils/xapp_rmr.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-utils/xapp_rmr.hpp rename to setup/xapp-sm-connector/src/xapp-utils/xapp_rmr.hpp diff --git a/setup/xapp-bs-connector/src/xapp-utils/xapp_sdl.cc b/setup/xapp-sm-connector/src/xapp-utils/xapp_sdl.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp-utils/xapp_sdl.cc rename to setup/xapp-sm-connector/src/xapp-utils/xapp_sdl.cc diff --git a/setup/xapp-bs-connector/src/xapp-utils/xapp_sdl.hpp b/setup/xapp-sm-connector/src/xapp-utils/xapp_sdl.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp-utils/xapp_sdl.hpp rename to setup/xapp-sm-connector/src/xapp-utils/xapp_sdl.hpp diff --git a/setup/xapp-bs-connector/src/xapp.cc b/setup/xapp-sm-connector/src/xapp.cc similarity index 100% rename from setup/xapp-bs-connector/src/xapp.cc rename to setup/xapp-sm-connector/src/xapp.cc diff --git a/setup/xapp-bs-connector/src/xapp.hpp b/setup/xapp-sm-connector/src/xapp.hpp similarity index 100% rename from setup/xapp-bs-connector/src/xapp.hpp rename to setup/xapp-sm-connector/src/xapp.hpp diff --git a/setup/xapp-bs-connector/src/xapp_env.sh b/setup/xapp-sm-connector/src/xapp_env.sh similarity index 100% rename from setup/xapp-bs-connector/src/xapp_env.sh rename to setup/xapp-sm-connector/src/xapp_env.sh diff --git a/setup/xapp-bs-connector/test/Makefile b/setup/xapp-sm-connector/test/Makefile similarity index 100% rename from setup/xapp-bs-connector/test/Makefile rename to setup/xapp-sm-connector/test/Makefile diff --git a/setup/xapp-bs-connector/test/hw_unit_tests.cc b/setup/xapp-sm-connector/test/hw_unit_tests.cc similarity index 100% rename from setup/xapp-bs-connector/test/hw_unit_tests.cc rename to setup/xapp-sm-connector/test/hw_unit_tests.cc diff --git a/setup/xapp-bs-connector/test/routes.txt b/setup/xapp-sm-connector/test/routes.txt similarity index 100% rename from setup/xapp-bs-connector/test/routes.txt rename to setup/xapp-sm-connector/test/routes.txt diff --git a/setup/xapp-bs-connector/test/test_db.h b/setup/xapp-sm-connector/test/test_db.h similarity index 100% rename from setup/xapp-bs-connector/test/test_db.h rename to setup/xapp-sm-connector/test/test_db.h diff --git a/setup/xapp-bs-connector/test/test_e2sm.h b/setup/xapp-sm-connector/test/test_e2sm.h similarity index 100% rename from setup/xapp-bs-connector/test/test_e2sm.h rename to setup/xapp-sm-connector/test/test_e2sm.h diff --git a/setup/xapp-bs-connector/test/test_hc.h b/setup/xapp-sm-connector/test/test_hc.h similarity index 100% rename from setup/xapp-bs-connector/test/test_hc.h rename to setup/xapp-sm-connector/test/test_hc.h diff --git a/setup/xapp-bs-connector/test/test_rmr.h b/setup/xapp-sm-connector/test/test_rmr.h similarity index 100% rename from setup/xapp-bs-connector/test/test_rmr.h rename to setup/xapp-sm-connector/test/test_rmr.h diff --git a/setup/xapp-bs-connector/test/test_subs.h b/setup/xapp-sm-connector/test/test_subs.h similarity index 100% rename from setup/xapp-bs-connector/test/test_subs.h rename to setup/xapp-sm-connector/test/test_subs.h diff --git a/setup/xapp-bs-connector/test/xapp_env.sh b/setup/xapp-sm-connector/test/xapp_env.sh similarity index 100% rename from setup/xapp-bs-connector/test/xapp_env.sh rename to setup/xapp-sm-connector/test/xapp_env.sh diff --git a/setup/xapp-bs-connector/tox.ini b/setup/xapp-sm-connector/tox.ini similarity index 100% rename from setup/xapp-bs-connector/tox.ini rename to setup/xapp-sm-connector/tox.ini