style(release): re-organize a bit the folder structure

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

NOTICE.md

@@ -4,4 +4,4 @@ For more details of the license, refer to [LICENSE](LICENSE) file in the same di
 
 However, it also includes OAI code or third party-software indicated below.
 
-* **`scripts/nrf_client.py`** is dstributed under `OAI Public License V1.1`.
+* **`src/nrf_client.py`** is dstributed under `OAI Public License V1.1`.

README.md

@@ -75,10 +75,11 @@ openair-cn5g-upf-vpp
 │   └── scripts
 ├── ci-scripts
 ├── docker
+├── docker-compose
 ├── docs
 │   └── images
-└── scripts
-    ├── patches
-    ├── tests
-    └── upf_conf
+├── scripts
+│   ├── patches
+│   └── upf_conf
+└── src
 </pre>

docker-compose/amf-healthcheck.sh

+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+AMF_PORT_FOR_NGAP=38412
+AMF_PORT_FOR_N11_HTTP=80
+AMF_IP_NGAP_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_NGAP | grep inet | awk {'print $2'})
+AMF_IP_N11_INTERFACE=$(ifconfig $AMF_INTERFACE_NAME_FOR_N11 | grep inet | awk {'print $2'})
+N2_PORT_STATUS=$(netstat -Snpl | grep -o "$AMF_IP_NGAP_INTERFACE:$AMF_PORT_FOR_NGAP")
+N11_PORT_STATUS=$(netstat -tnpl | grep -o "$AMF_IP_N11_INTERFACE:$AMF_PORT_FOR_N11_HTTP")
+#Check if entrypoint properly configured the conf file and no parameter is unset (optional)
+NB_UNREPLACED_AT=`cat /openair-amf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+
+if [ $NB_UNREPLACED_AT -ne 0 ]; then
+	STATUS=1
+	echo "Healthcheck error: configuration file is not configured properly"
+fi
+
+if [[ -z $N2_PORT_STATUS ]]; then
+	STATUS=1
+	echo "Healthcheck error: N2 SCTP port $AMF_PORT_FOR_NGAP is not listening"
+fi
+
+if [[ -z $N11_PORT_STATUS ]]; then
+	STATUS=1
+	echo "Healthcheck error: N11/SBI TCP/HTTP port $AMF_PORT_FOR_N11_HTTP is not listening"
+fi
+
+#host="${MYSQL_SERVER}"
+#user="${MYSQL_USER:-root}"
+#export MYSQL_PWD="${MYSQL_PASS}"
+
+#args=(
+#	-h"$host"
+#	-u"$user"
+#	--silent
+#)
+
+#if ! command -v mysql &> /dev/null; then
+#	echo "Installing mysql command"
+#	apt update
+#	apt-get -y install mysql-client
+#else
+#	if select="$(echo 'SELECT 1' | mysql "${args[@]}")" && [ "$select" = '1' ]; then
+#		database_check=$(mysql -h$host -u$user -D oai_db --silent -e "SELECT * FROM users;")
+#		if [[ -z $database_check ]]; then
+#			echo "Healthcheck error: oai_db not populated"
+#			STATUS=1
+#		fi
+#		STATUS=0
+#	else
+#		echo "Healthcheck error: Mysql port inactive"
+#		STATUS=1
+#	fi
+#fi
+
+exit $STATUS

scripts/tests/docker-compose.yml → docker-compose/docker-compose.yml

@@ -154,7 +154,7 @@ services:
             public_net_core:
                 ipv4_address: 192.168.71.133
     vpp-upf:
-        image: oai-upf-vpp:develop
+        image: oai-upf-vpp:latest
         privileged: true
         container_name: vpp-upf
         environment:

docker-compose/nrf-healthcheck.sh

+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+NRF_IP_SBI_INTERFACE=$(ifconfig $NRF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
+NRF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$NRF_IP_SBI_INTERFACE:$NRF_INTERFACE_PORT_FOR_SBI")
+#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
+NB_UNREPLACED_AT=`cat /openair-nrf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+
+if [ $NB_UNREPLACED_AT -ne 0 ]; then
+	STATUS=1
+	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
+fi
+
+if [[ -z $NRF_SBI_PORT_STATUS ]]; then
+	STATUS=1
+	echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $NRF_INTERFACE_PORT_FOR_SBI is not listening."
+fi
+
+exit $STATUS
\ No newline at end of file

docker-compose/smf-healthcheck.sh

+#!/bin/bash
+set -eo pipefail
+
+STATUS=0
+SMF_IP_SBI_INTERFACE=$(ifconfig $SMF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
+#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
+SMF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$SMF_IP_SBI_INTERFACE:$SMF_INTERFACE_PORT_FOR_SBI")
+NB_UNREPLACED_AT=`cat /openair-smf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
+
+if [ $NB_UNREPLACED_AT -ne 0 ]; then
+	STATUS=-1
+	echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
+fi
+
+if [[ -z $SMF_SBI_PORT_STATUS ]]; then
+	STATUS=-1
+	echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $SMF_INTERFACE_PORT_FOR_SBI is not listening."
+fi
+
+exit $STATUS

docker/Dockerfile.upf-vpp.rhel7

@@ -60,7 +60,7 @@ RUN wget http://repo.openfusion.net/centos7-x86_64/hyperscan-devel-5.3.0-1.of.el
          && rpm -i *.rpm
 
 WORKDIR /vpp-upf
-COPY scripts/ /vpp-upf/scripts
+COPY . .
 
 # Applying vpp patches
 RUN git clone -b stable/2101 https://github.com/fdio/vpp.git && \
@@ -106,7 +106,7 @@ WORKDIR /openair-upf/bin
 COPY --from=vpp-upf-builder /vpp-upf/scripts/entrypoint.sh .
 COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vpp .
 COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vppctl .
-COPY --from=vpp-upf-builder /vpp-upf/scripts/nrf_client.py .
+COPY --from=vpp-upf-builder /vpp-upf/src/nrf_client.py .
 
 WORKDIR /openair-upf/etc
 COPY --from=vpp-upf-builder /vpp-upf/scripts/upf_conf/init.conf .

docker/Dockerfile.upf-vpp.ubuntu18

@@ -53,7 +53,7 @@ RUN git config --global https.postBuffer 123289600 && \
     git config --global http.sslverify false
 
 WORKDIR /vpp-upf
-COPY scripts/ /vpp-upf/scripts
+COPY . .
 
 # Applying vpp patches
 RUN git clone -b stable/2101 https://github.com/fdio/vpp.git && \
@@ -104,7 +104,7 @@ WORKDIR /openair-upf/bin
 COPY --from=vpp-upf-builder /vpp-upf/scripts/entrypoint.sh .
 COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vpp .
 COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vppctl .
-COPY --from=vpp-upf-builder /vpp-upf/scripts/nrf_client.py .
+COPY --from=vpp-upf-builder /vpp-upf/src/nrf_client.py .
 
 WORKDIR /openair-upf/etc
 COPY --from=vpp-upf-builder /vpp-upf/scripts/upf_conf/init.conf .