Tag v1.7.0

* srsRAN_Project migration to OCUDU

* Tag v1.7.0

Author: fjcintron

5G_Core_Network/Additional_Cores_5GDeploy/full_install.sh

@@ -113,11 +113,11 @@ if [ ! -d "5gdeploy" ]; then
     "$PARENT_DIR/./install_scripts/git_clone.sh" https://github.com/usnistgov/5gdeploy.git
 fi
 
-cd $SCRIPT_DIR/5gdeploy
+cd "$SCRIPT_DIR/5gdeploy"
 echo "Patching netdef/helpers.ts to generate NR Cell ID starting at hex 0xE000 (aligning with OAI gNB) instead of 0x10"
 sed -i '0,/^[[:space:]]*nci[[:space:]]*=.*$/s//      nci = hexPad(((3584 + i) << (36 - gnbIdLength)) | 0xF, 9),/' netdef/helpers.ts
 
-cd $SCRIPT_DIR
+cd "$SCRIPT_DIR"
 
 # Install dependencies
 mkdir -p logs
@@ -182,15 +182,26 @@ cd "$SCRIPT_DIR/5gdeploy"
 
 # Install 5gdeploy. For more information, see the 5gdeploy documentation: https://github.com/usnistgov/5gdeploy/blob/main/docs/INSTALL.md
 echo "Starting installation of 5G Core Deployment Helper (5gdeploy)..."
+
+# # Downgrade to debian:bullseye for compatibility with older Docker versions
+# echo "Patching Dockerfiles to use debian:bullseye for compatibility..."
+# sed -i 's/buildpack-deps:bookworm/buildpack-deps:bullseye/g' docker/sockperf/Dockerfile
+# sed -i 's/debian:bookworm/debian:bullseye/g' docker/sockperf/Dockerfile
+# sed -i 's/bookworm-apt-cache/bullseye-apt-cache/g' docker/sockperf/Dockerfile
+# sed -i 's/debian:bookworm/debian:bullseye/g' docker/virt/Dockerfile
+# sed -i 's/bookworm-apt-cache/bullseye-apt-cache/g' docker/virt/Dockerfile
+# sed -i 's/debian:trixie-slim/debian:bullseye-slim/g' docker/iperf2/Dockerfile
+# sed -i 's/trixie-apt-cache/bullseye-apt-cache/g' docker/iperf2/Dockerfile
+
 ./install.sh \
     --build-network host \
     --dpdk-version v24.11 \
     --eupf-version 54ed069c6cdf1da18b09bd78cb166bc4e4dd1ceb \
-    --free5gc-version v4.0.1 \
-    --free5gc-webconsole-version v1.4.1 \
+    --free5gc-version v4.2.1 \
+    --free5gc-webconsole-version v1.4.4 \
     --gnbsim-version d3fce7e35a69b9f5d670242a93b7d1bee8842ecf \
-    --gtp5g-version v0.9.13 \
-    --oai-fed-version 2024.w45 \
+    --gtp5g-version v0.9.16 \
+    --oai-fed-version v2.2.0 \
     --oai-nwdaf-version 6a1408c9be6f5cf0ddb6c1f1b527a04e36205471 \
     --open5gs-dbctl-version v2.7.6 \
     --open5gs-version 2.7.6 \

5G_Core_Network/Additional_Cores_5GDeploy/full_uninstall.sh

@@ -46,7 +46,7 @@ echo "Stopping all 5G Core Deployment Helper (5gdeploy) containers..."
 
 ./install_scripts/uninstall_lazydocker.sh
 
-cd $SCRIPT_DIR/5gdeploy
+cd "$SCRIPT_DIR/5gdeploy"
 
 echo "Removing system packages (httpie, jq, python3-libconf, wireshark-common, nodejs, npm)..."
 sudo apt-get remove --purge -y httpie jq python3-libconf wireshark-common nodejs npm
@@ -76,7 +76,7 @@ sudo rm -f /etc/apt/keyrings/nodesource.gpg
 echo "Removing yq snap..."
 sudo snap remove yq
 
-cd $SCRIPT_DIR
+cd "$SCRIPT_DIR"
 
 echo "Removing Docker and cleaning config..."
 ./install_scripts/uninstall_docker.sh

5G_Core_Network/Additional_Cores_5GDeploy/install_scripts/install_docker.sh

@@ -146,6 +146,14 @@ if ! command -v dockerd >/dev/null 2>&1 || ! command -v docker >/dev/null 2>&1;
         sudo env $APTVARS apt-get install -y $APTOPTS "docker-ce=$DOCKERVERSION"
     fi
 fi
+if ! command -v docker >/dev/null 2>&1 || [ ! -e /usr/bin/docker ]; then
+    echo "Docker CLI not found. Attempting to reinstall..."
+    if [ "$USE_DOCKER_CE" -eq 0 ]; then
+        sudo env $APTVARS apt-get install --reinstall -y $APTOPTS "docker.io=$DOCKERVERSION"
+    else
+        sudo env $APTVARS apt-get install --reinstall -y $APTOPTS "docker-ce-cli=$DOCKERVERSION"
+    fi
+fi
 
 # Configure Docker daemon
 echo "Configuring Docker daemon..."
@@ -265,6 +273,7 @@ else
     sudo pkill -x containerd >/dev/null 2>&1 || true
     sudo rm -f /var/run/docker.pid /var/run/docker.sock
     sudo mkdir -p /run /var/run
+    sudo -v # Ensure sudo session is active
     sudo sh -c 'setsid dockerd --config-file=/etc/docker/daemon.json >>'"${DOCKERD_LOG}"' 2>&1 </dev/null &'
     # Wait for Docker to be ready
     for ATTEMPT in $(seq 1 60); do
@@ -283,6 +292,7 @@ else
         if ! grep -q 'native.cgroupdriver' /etc/docker/daemon.json; then
             sudo jq '. + {"exec-opts": ["native.cgroupdriver=cgroupfs"]}' /etc/docker/daemon.json.bak | sudo tee /etc/docker/daemon.json >/dev/null
         fi
+        sudo -v # Ensure sudo session is active
         sudo sh -c 'setsid dockerd --config-file=/etc/docker/daemon.json >>'"${DOCKERD_LOG}"' 2>&1 </dev/null &'
         for ATTEMPT in $(seq 1 60); do
             if sudo test -S /var/run/docker.sock && sudo docker version >/dev/null 2>&1; then

5G_Core_Network/Additional_Cores_5GDeploy/install_scripts/phoenix_build.sh

@@ -45,7 +45,7 @@ fi
 # cd phoenix-repo
 
 # # The /opt directory is used by some scripts in phoenix
-# sudo chown --recursive "$USER" /opt
+# sudo chown --recursive "${SUDO_USER:-$USER}" /opt
 # mkdir -p /opt/$COMPANY_NAME/open5gcoreRelX
 # if [ ! -e /opt/$COMPANY_NAME/open5gcoreRelX/phoenix-src ]; then
 #     ln -s /opt/$COMPANY_NAME/open5gcoreRelX/phoenix phoenix-src

5G_Core_Network/Additional_Cores_5GDeploy/install_scripts/start_sudo_refresh.sh

@@ -30,7 +30,7 @@
 
 echo "# Script: $(realpath "$0")..."
 
-sudo ls &>/dev/null
+sudo -v # Ensure sudo session is active
 SCRIPT_DIR=$(dirname "$(realpath "$0")")
 cd "$(dirname "$SCRIPT_DIR")"
 

5G_Core_Network/Additional_Cores_5GDeploy/install_scripts/stop_sudo_refresh.sh

@@ -31,5 +31,5 @@
 echo "# Script: $(realpath "$0")..."
 
 # Attempt to kill the process
-pkill -f "sudo_stay_validated.sh" || echo "No process found to stop."
+pkill -f "[s]udo_stay_validated.sh" || echo "No process found to stop."
 echo "Sudo refresh process stopped or was not running."

5G_Core_Network/Additional_Cores_5GDeploy/install_scripts/sudo_stay_validated.sh

@@ -32,6 +32,6 @@ echo "# Script: $(realpath "$0")..."
 
 # Simple script to keep sudo active by refreshing it every minute
 while true; do
-    sudo -v
+    sudo -v # Ensure sudo session is active
     sleep 60
 done

5G_Core_Network/Additional_Cores_5GDeploy/install_scripts/uninstall_docker.sh

@@ -31,9 +31,6 @@
 # Exit immediately if a command fails
 set -e
 
-# Echo every command as it is ran
-set -x
-
 SCRIPT_DIR=$(dirname "$(realpath "$0")")
 BASE_DIR=$(realpath "$SCRIPT_DIR/../..")
 cd "$SCRIPT_DIR"

5G_Core_Network/Additional_Cores_5GDeploy/run.sh

@@ -111,7 +111,14 @@ fi
 # # Dynamic AMF IP support: Fetch the AMF IP, and it will be updated in the configuration file
 # # This code is optional since the AMF IP is fixed on configuration; dynamic IP is not needed
 # AMF_IP=$(docker inspect amf | jq -r '.[0].NetworkSettings.Networks["br-n2"].IPAddress')
-# AMF_IP_BIND=$(ip route get 1 | awk '{print $(NF-2); exit}') # Get the IP of the primary network interface
+# if [ -f "$PARENT_DIR/options.yaml" ]; then
+#     EXPOSE_AMF=$(yq eval '.expose_amf_over_hostname' "$PARENT_DIR/options.yaml")
+# fi
+# if [ "$EXPOSE_AMF" = "true" ]; then
+#     AMF_IP_BIND=$(ip route get 1 | awk '{print $(NF-2); exit}') # Get the IP of the primary network interface
+# else
+#     AMF_IP_BIND="127.0.0.1"
+# fi
 # AMF_ADDRESSES_OUTPUT="configs/get_amf_address.txt"
 # echo "$AMF_IP" >$AMF_ADDRESSES_OUTPUT
 # echo "$AMF_IP_BIND" >>$AMF_ADDRESSES_OUTPUT

5G_Core_Network/full_install.sh

@@ -79,10 +79,11 @@ if [ ! -f "options.yaml" ]; then
     echo "" >>"options.yaml"
     echo "# Configure the Single Network Slice Selection Assistance Information (S-NSSAI)" >>"options.yaml"
     echo "# NOTE: \"sst\" and \"sd\" are interpreted as hexadecimal values (no 0x prefix)." >>"options.yaml"
-    echo "sst: 1" >>"options.yaml"
-    echo "sd: 000001" >>"options.yaml"
+    echo "slices:" >>"options.yaml"
+    echo "  - sst: 1" >>"options.yaml"
+    echo "    sd: FFFFFF" >>"options.yaml"
     echo "" >>"options.yaml"
-    echo "# If core_to_use=open5gs, false means AMF will use the default 127.0.0.5, true means it will use the hostname IP" >>"options.yaml"
+    echo "# If false, AMF will use a local IP, otherwise it will use the hostname IP" >>"options.yaml"
     echo "expose_amf_over_hostname: false" >>"options.yaml"
     echo "" >>"options.yaml"
     echo "# If core_to_use=open5gs, toggle whether or not to include the Security Edge Protection Proxies (SEPP1 and SEPP2)" >>"options.yaml"
@@ -177,7 +178,7 @@ if [ ! -d "open5gs" ]; then
     ./install_scripts/git_clone.sh https://github.com/open5gs/open5gs.git
 fi
 
-cd $SCRIPT_DIR/open5gs
+cd "$SCRIPT_DIR/open5gs"
 
 echo
 echo
@@ -214,7 +215,8 @@ sudo usermod -a -G open5gs open5gs
 echo "Installing dependencies for building Open5GS..."
 
 # Code from (https://open5gs.org/open5gs/docs/guide/02-building-open5gs-from-sources#building-open5gs):
-sudo env $APTVARS apt-get install -y python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git cmake libsctp-dev libgnutls28-dev libgcrypt-dev libssl-dev libmongoc-dev libbson-dev libyaml-dev libmicrohttpd-dev libcurl4-gnutls-dev libnghttp2-dev libtins-dev libtalloc-dev meson
+sudo env $APTVARS apt-get install -y python3-pip python3-setuptools python3-wheel ninja-build build-essential flex bison git cmake libsctp-dev libgnutls28-dev libgcrypt-dev libssl-dev libmongoc-dev libbson-dev libyaml-dev libmicrohttpd-dev libcurl4-gnutls-dev libnghttp2-dev libtins-dev libtalloc-dev
+sudo -H pip3 install --upgrade meson # Ensure pip3 version overrides apt version to prevent segmentation faults
 if apt-cache show libidn-dev >/dev/null 2>&1; then
     sudo env $APTVARS apt-get install -y --no-install-recommends libidn-dev
 else
@@ -226,7 +228,7 @@ rm -rf build
 # Check if Open5GS has already been built and installed
 if [ ! -d "build" ]; then
     echo "Compiling Open5GS with Meson..."
-    meson build --prefix="$(pwd)/install" # -Dc_args="-fPIC" -Dc_link_args=""
+    meson build --prefix="$(pwd)/install" -Dc_args="-fPIC" -Dcpp_args="-fPIC" -Dc_link_args="-fPIC" -Dcpp_link_args="-fPIC"
 else
     echo "Open5GS build directory already exists."
 fi