Tag v1.6.0

Author: fjcintron

5G_Core_Network/Additional_Cores_5GDeploy/full_install.sh

@@ -44,7 +44,7 @@ PARENT_DIR=$(dirname "$SCRIPT_DIR")
 cd "$PARENT_DIR"
 
 # Ensure the correct YAML editor is installed
-sudo "$SCRIPT_DIR/install_scripts/./ensure_consistent_yq.sh"
+"$SCRIPT_DIR/install_scripts/./ensure_consistent_yq.sh"
 
 # Ensure that 5G_Core_Network/options.yaml is configured to use 5gdeploy instead of Open5GS
 if [ -f "options.yaml" ]; then
@@ -89,6 +89,19 @@ fi
 echo "Using CP: $CORE_TO_USE"
 echo "Using UP: $UPF_TO_USE"
 
+# Detect if systemctl is available
+USE_SYSTEMCTL=false
+if command -v systemctl >/dev/null 2>&1; then
+    if [ "$(cat /proc/1/comm 2>/dev/null)" = "systemd" ]; then
+        OUTPUT="$(systemctl 2>&1 || true)"
+        if echo "$OUTPUT" | grep -qiE 'not supported|System has not been booted with systemd'; then
+            echo "Detected systemctl is not supported. Using background processes instead."
+        elif systemctl list-units >/dev/null 2>&1 || systemctl is-system-running --quiet >/dev/null 2>&1; then
+            USE_SYSTEMCTL=true
+        fi
+    fi
+fi
+
 cd "$SCRIPT_DIR"
 
 if [ "$CORE_TO_USE" == "5gdeploy-phoenix" ]; then
@@ -106,21 +119,33 @@ sed -i '0,/^[[:space:]]*nci[[:space:]]*=.*$/s//      nci = hexPad(((3584 + i) <<
 
 cd $SCRIPT_DIR
 
-# Step 1: Install dependencies
+# Install dependencies
 mkdir -p logs
+
+# Prevent nvm from interfering with the Node.js installation
+if [ -d "$HOME/.nvm" ]; then
+    export NVM_DIR="$HOME/.nvm"
+    if [ -s "$NVM_DIR/nvm.sh" ]; then
+        source "$NVM_DIR/nvm.sh"
+        echo "Deactivating nvm to prevent interference with Node.js installation..."
+        nvm deactivate || true
+        nvm unload || true
+    fi
+fi
+
+if command -v node &>/dev/null; then
+    NODE_VERSION=$(node --version | sed 's/v//g' | cut -d. -f1)
+    if [ "$NODE_VERSION" -lt 22 ]; then
+        echo "Node.js version is less than 22, reinstalling Node.js 22.x"
+        sudo apt-get purge -y nodejs npm || true
+        rm -f logs/full_install_step_1_complete
+    fi
+fi
+
 if [ -f logs/full_install_step_1_complete ]; then
     if ! command -v docker &>/dev/null; then
         rm logs/full_install_step_1_complete
     fi
-    # If node version is less than 22, re-run step 1
-    if command -v node &>/dev/null; then
-        NODE_VERSION=$(node --version | sed 's/v//g' | cut -d. -f1)
-        if [ "$NODE_VERSION" -lt 22 ]; then
-            echo "Node.js version is less than 22, reinstalling Node.js 22.x"
-            sudo apt-get purge -y nodejs npm || true
-            rm logs/full_install_step_1_complete
-        fi
-    fi
 fi
 if [ ! -f logs/full_install_step_1_complete ]; then
     # Install system packages
@@ -187,8 +212,7 @@ fi
 
 cd "$SCRIPT_DIR/5gdeploy"
 
-# Step 2: Install 5gdeploy
-# For more information, see the 5gdeploy documentation: https://github.com/usnistgov/5gdeploy/blob/main/docs/INSTALL.md
+# 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)..."
 ./install.sh \
     --dpdk-version v24.11 \

5G_Core_Network/Additional_Cores_5GDeploy/full_uninstall.sh

@@ -41,7 +41,7 @@ SCRIPT_DIR=$(dirname "$(realpath "$0")")
 PARENT_DIR=$(dirname "$SCRIPT_DIR")
 cd "$SCRIPT_DIR"
 
-echo "Stopping all Open5GS containers..."
+echo "Stopping all 5G Core Deployment Helper (5gdeploy) containers..."
 ./stop.sh
 
 ./install_scripts/uninstall_lazydocker.sh

5G_Core_Network/Additional_Cores_5GDeploy/generate_configurations.sh

@@ -52,11 +52,11 @@ PARENT_DIR=$(dirname "$SCRIPT_DIR")
 cd "$SCRIPT_DIR"
 
 if [ ! -d "5gdeploy" ]; then
-    echo "Error: Cannot find 5gdeploy directory. Please run the full_install.sh script first."
+    echo "ERROR: Cannot find 5gdeploy directory. Please run the full_install.sh script first."
     exit 1
 fi
 if [ ! -d "5gdeploy/scenario" ]; then
-    echo "Error: Cannot find 5gdeploy/scenario directory. Please run the full_install.sh script first."
+    echo "ERROR: Cannot find 5gdeploy/scenario directory. Please run the full_install.sh script first."
     exit 1
 fi
 
@@ -87,7 +87,7 @@ fi
 cd "$PARENT_DIR"
 
 # Ensure the correct YAML editor is installed
-sudo "$SCRIPT_DIR/install_scripts/./ensure_consistent_yq.sh"
+"$SCRIPT_DIR/install_scripts/./ensure_consistent_yq.sh"
 
 echo "Parsing options.yaml..."
 # Check if the YAML file exists, if not, set and save default values
@@ -142,9 +142,6 @@ if [ ! -f "options.yaml" ]; then
     echo "" >>"options.yaml"
     echo "ogstun3_ipv4: 10.47.0.0/16" >>"options.yaml"
     echo "ogstun3_ipv6: 2001:db8:face::/48" >>"options.yaml"
-    echo "" >>"options.yaml"
-    echo "# If core_to_use=open5gs, the use of systemctl can be disabled to support installations within Docker. Before changing this value, it is recommended to uninstall the testbed." >>"options.yaml"
-    echo "use_systemctl: true" >>"options.yaml"
 fi
 
 # Read PLMN and TAC values from the YAML file using yq
@@ -183,22 +180,22 @@ fi
 
 # Configure the DNN, SST, and SD values
 DNN=$(sed -n 's/^dnn: //p' options.yaml)
-SST=$(yq eval '.sst' options.yaml)
-SD=$(yq eval '.sd' options.yaml)
+SST=$(yq eval '.slices[0].sst' options.yaml)
+SD=$(yq eval '.slices[0].sd' options.yaml)
 if [[ -z "$DNN" || "$DNN" == "null" ]]; then
     echo "DNN is not set in options.yaml, please ensure that \"dnn\" is set."
     exit 1
 fi
 if [[ -z "$SST" || -z "$SD" || "$SST" == "null" || "$SD" == "null" ]]; then
-    echo "SST or SD is not set in options.yaml, please ensure that \"sst\" and \"sd\" are set."
+    echo "SST or SD is not set in options.yaml, please ensure that \"slices[].sst\" and \"slices[].sd\" are set."
     exit 1
 fi
 
 cd "$SCRIPT_DIR"
 
 UE_CREDENTIAL_GENERATOR_SCRIPT="$(dirname "$PARENT_DIR")/User_Equipment/ue_credentials_generator.sh"
 if [ ! -f "$UE_CREDENTIAL_GENERATOR_SCRIPT" ]; then
-    echo "Error: Cannot find $UE_CREDENTIAL_GENERATOR_SCRIPT to generate UE subscriber credentials."
+    echo "ERROR: Cannot find $UE_CREDENTIAL_GENERATOR_SCRIPT to generate UE subscriber credentials."
     exit 1
 fi
 
@@ -226,14 +223,14 @@ else
     # Remove the prefix if it exists
     CORE="${CORE_TO_USE#5gdeploy-}"
     echo
-    read -p "WARNING: Unknown core: \"$CORE\", 5gdeploy may not support this core. Do you want to proceed? (y/n): " yn
-    case $yn in
-    [Yy]*) ;;
-    *)
+    echo "WARNING: Unknown core: \"$CORE\", 5gdeploy may not support this core."
+    echo "Do you want to proceed? (Y/n)"
+    read -r CONFIRM
+    CONFIRM=$(echo "${CONFIRM:-y}" | tr '[:upper:]' '[:lower:]')
+    if [[ "$CONFIRM" != "y" && "$CONFIRM" != "yes" ]]; then
         echo "Exiting."
         exit 1
-        ;;
-    esac
+    fi
 fi
 
 # Ensure that the UPF is set correctly
@@ -256,16 +253,15 @@ elif [ "$UPF_TO_USE" == "5gdeploy-ndndpdk" ]; then
 else
     # Remove the prefix if it exists
     UPF="${UPF_TO_USE#5gdeploy-}"
-    echo "Unknown UPF: $UPF"
     echo
-    read -p "WARNING: 5gdeploy may not support this UPF. Do you want to proceed? (y/n): " yn
-    case $yn in
-    [Yy]*) ;;
-    *)
+    echo "WARNING: Unknown UPF: \"$UPF\", 5gdeploy may not support this UPF."
+    echo "Do you want to proceed? (Y/n)"
+    read -r CONFIRM
+    CONFIRM=$(echo "${CONFIRM:-y}" | tr '[:upper:]' '[:lower:]')
+    if [[ "$CONFIRM" != "y" && "$CONFIRM" != "yes" ]]; then
         echo "Exiting."
         exit 1
-        ;;
-    esac
+    fi
 fi
 
 cd "$SCRIPT_DIR"