Tag v1.5.0-2

Author: Simewu

Next_Generation_Node_B/run.sh

@@ -46,7 +46,7 @@ graceful_shutdown() {
     ./stop.sh
     exit
 }
-trap graceful_shutdown SIGINT
+trap graceful_shutdown SIGINT SIGTERM SIGQUIT
 
 if pgrep -x "gnb" >/dev/null; then
     echo "Already running gnb."

OpenAirInterface_Testbed/Next_Generation_Node_B/install_scripts/revert_du_namespace.sh

@@ -34,6 +34,7 @@ echo "# Script: $(realpath "$0")..."
 set +e
 
 SCRIPT_DIR=$(dirname "$(realpath "$0")")
+cd "$SCRIPT_DIR"
 
 DU_NUMBER=$1
 
@@ -51,10 +52,8 @@ DU_NAMESPACE="du$DU_NUMBER"
 
 # Give the DU its own network namespace and configure it to access the host network
 NETWORK_INTERFACE=$(ip route | grep default | awk '{print $5}')
-DU_INDEX=$((DU_NUMBER - 1))
-
 # Fetch the base IP using the Python script
-BASE_IP=$(python3 fetch_nth_ip.py 0.10.202.0/24 $DU_INDEX)
+BASE_IP=$(python3 fetch_nth_ip.py 0.10.202.0/24 $((DU_NUMBER - 1)))
 DU_SUBNET_FIRST_3_OCTETS=$(echo $BASE_IP | cut -d. -f2-4)
 DU_HOST_IP=$DU_SUBNET_FIRST_3_OCTETS.1
 DU_NS_IP=$DU_SUBNET_FIRST_3_OCTETS.2

OpenAirInterface_Testbed/Next_Generation_Node_B/install_scripts/setup_du_namespace.sh

@@ -52,19 +52,12 @@ DU_NAMESPACE="du$DU_NUMBER"
 
 # Give the DU its own network namespace and configure it to access the host network
 NETWORK_INTERFACE=$(ip route | grep default | awk '{print $5}')
-DU_INDEX=$((DU_NUMBER - 1))
-
 # Fetch the base IP using the Python script
-BASE_IP=$(python3 fetch_nth_ip.py 0.10.202.0/24 $DU_INDEX)
+BASE_IP=$(python3 fetch_nth_ip.py 0.10.202.0/24 $((DU_NUMBER - 1)))
 DU_SUBNET_FIRST_3_OCTETS=$(echo $BASE_IP | cut -d. -f2-4)
 DU_HOST_IP=$DU_SUBNET_FIRST_3_OCTETS.1
 DU_NS_IP=$DU_SUBNET_FIRST_3_OCTETS.2
 
-echo "Subnet is $DU_SUBNET_FIRST_3_OCTETS.0/24"
-echo "Host IP is $DU_HOST_IP"
-echo "Namespace IP is $DU_NS_IP"
-exit 0
-
 # Code from (https://open-cells.com/index.php/2021/02/08/rf-simulator-1-enb-2-ues-all-in-one):
 sudo ip netns delete $DU_NAMESPACE || true
 sudo ip link delete v-eth-du$DU_NUMBER || true

OpenAirInterface_Testbed/README.md

@@ -42,7 +42,7 @@ The script `run_handover_scenario.sh`, based on the handover tutorial [\[4\]][oa
   <hr>
 
   <p align="center">
-    <img src="../Images/F1_Handover_Scenario_Example.png" alt="F1 Handover Scenario Example Output" width="70%">
+    <img src="../Images/F1_Handover_Scenario_Example.png" alt="F1 Handover Scenario Example Output">
   </p>
 
 </details>

OpenAirInterface_Testbed/User_Equipment/generate_configurations.sh

@@ -140,6 +140,17 @@ if [[ -z "$SST" || -z "$SD" || "$SST" == "null" || "$SD" == "null" ]]; then
     exit 1
 fi
 
+OGSTUN_IPV4=$(yq eval '.ogstun_ipv4' "$YAML_PATH")
+OGSTUN_IPV6=$(yq eval '.ogstun_ipv6' "$YAML_PATH")
+if [[ "$OGSTUN_IPV4" == "null" || -z "$OGSTUN_IPV4" ]]; then
+    echo "Missing parameter in "$YAML_PATH": ogstun_ipv4"
+    exit 1
+fi
+if [[ "$OGSTUN_IPV6" == "null" || -z "$OGSTUN_IPV6" ]]; then
+    echo "Missing parameter in "$YAML_PATH": ogstun_ipv6"
+    exit 1
+fi
+
 echo "Saving configuration file example..."
 if [ "$CLEAR_CONFIGS" = true ]; then
     sudo rm -rf configs
@@ -198,11 +209,19 @@ for UE_NUMBER in "${UE_NUMBERS[@]}"; do
         echo "@include \"channelmod_rfsimu.conf\"" >>"configs/ue$UE_NUMBER.conf"
     fi
 
+    UE_IPV4=""
     if [ $UE_NUMBER -gt 3 ]; then
         echo "UE is greater than registered subscribers, registering UE $UE_NUMBER..."
         REGISTRATION_DIR=$(dirname "$SCRIPT_DIR")/5G_Core_Network/install_scripts
         if [ -f "$REGISTRATION_DIR/./register_subscriber.sh" ]; then
-            "$REGISTRATION_DIR/./register_subscriber.sh" --imsi "$UE_IMSI" --key "$UE_KEY" --opc "$UE_OPC" --apn "$DNN" || true
+            UE_INDEX=$((UE_NUMBER + 99))
+            UE_IPV4=$(python3 install_scripts/fetch_nth_ip.py "$OGSTUN_IPV4" "$UE_INDEX")
+            if [ $? -eq 0 ]; then
+                IPV4_LINE="--ipv4 $UE_IPV4"
+            else
+                IPV4_LINE=""
+            fi
+            "$REGISTRATION_DIR/./register_subscriber.sh" --imsi "$UE_IMSI" --key "$UE_KEY" --opc "$UE_OPC" --apn "$DNN" --sst "$SST" --sd "$SD" $IPV4_LINE || true
         fi
     fi
 
@@ -216,6 +235,9 @@ for UE_NUMBER in "${UE_NUMBERS[@]}"; do
     echo "    DNN:  $DNN"
     echo "    SST:  $SST"
     echo "    SD:   $SD"
+    if [ -n "$UE_IPV4" ]; then
+        echo "    IPv4: $UE_IPV4"
+    fi
     echo
 
     echo "The configuration file is located in the configs/ directory."

OpenAirInterface_Testbed/User_Equipment/install_scripts/fetch_nth_ip.py

@@ -0,0 +1,51 @@
+#!/usr/bin/env python3
+
+# Usage:
+#	 fetch_nth_ip.py <subnet> <offset>
+
+# For example:
+#   fetch_nth_ip.py 192.168.1.0/24 0 returns 192.168.1.1
+#   fetch_nth_ip.py 2001:db8::/64 0 returns 2001:db8::1
+#   fetch_nth_ip.py 192.168.1.0/24 10 returns 192.168.1.11
+#   fetch_nth_ip.py 2001:db8::/64 10 returns 2001:db8::b
+
+import sys
+import argparse
+import ipaddress
+
+def fetch_nth_address(network_str, offset):
+	net = ipaddress.ip_network(network_str, strict=False)
+	assert offset >= 0, "Offset must be non-negative"
+
+	if isinstance(net, ipaddress.IPv4Network):
+		if net.prefixlen == 32:
+			assert offset == 0, "Offset out of range for single-address subnet."
+			return net.network_address
+		if net.prefixlen == 31:
+			assert offset < 2, "Offset out of range for two-address subnet."
+			return ipaddress.ip_address(int(net.network_address) + offset)
+		# Regular IPv4: skip network and broadcast
+		usable = net.num_addresses - 2
+		assert offset < usable, f"Offset out of range. Usable range: 0 to {usable-1}"
+		return ipaddress.ip_address(int(net.network_address) + 1 + offset)
+
+	if net.prefixlen == 128: # IPv6
+		assert offset == 0, "Offset out of range for single-address subnet."
+		return net.network_address
+
+	# Skip the base address by default
+	usable = net.num_addresses - 1
+	assert offset < usable, f"Offset out of range. Usable range: 0 to {usable-1}"
+	return ipaddress.ip_address(int(net.network_address) + 1 + offset)
+
+if __name__ == "__main__":
+	ap = argparse.ArgumentParser(description="Return the Nth address from a network.")
+	ap.add_argument("subnet", help="Network in CIDR notation, e.g. 192.168.1.0/24 or 2001:db8::/64")
+	ap.add_argument("offset", type=int, help="Offset from the first address")
+	args = ap.parse_args()
+	try:
+		ip = fetch_nth_address(args.subnet, args.offset)
+		print(str(ip))
+	except Exception as e:
+		print(f"ERROR: {e}", file=sys.stderr)
+		sys.exit(1)

OpenAirInterface_Testbed/User_Equipment/install_scripts/revert_ue_namespace.sh

@@ -33,6 +33,9 @@ echo "# Script: $(realpath "$0")..."
 # Do not exit immediately if a command fails
 set +e
 
+SCRIPT_DIR=$(dirname "$(realpath "$0")")
+cd "$SCRIPT_DIR"
+
 UE_NUMBER=$1
 
 if [[ -z "$UE_NUMBER" ]]; then
@@ -47,8 +50,11 @@ fi
 
 UE_NAMESPACE="ue$UE_NUMBER"
 
+# Give the UE its own network namespace and configure it to access the host network
 NETWORK_INTERFACE=$(ip route | grep default | awk '{print $5}')
-UE_SUBNET_FIRST_3_OCTETS=10.201.$UE_NUMBER
+# Fetch the base IP using the Python script
+BASE_IP=$(python3 fetch_nth_ip.py 0.10.201.0/24 $((UE_NUMBER - 1)))
+UE_SUBNET_FIRST_3_OCTETS=$(echo $BASE_IP | cut -d. -f2-4)
 UE_HOST_IP=$UE_SUBNET_FIRST_3_OCTETS.1
 UE_NS_IP=$UE_SUBNET_FIRST_3_OCTETS.2
 
@@ -58,7 +64,6 @@ sudo ip netns exec $UE_NAMESPACE ip addr del $UE_NS_IP/24 dev v-$UE_NAMESPACE
 sudo ip netns exec $UE_NAMESPACE ip link set v-$UE_NAMESPACE down
 
 echo "Removing iptables rules..."
-
 sudo iptables -D FORWARD -o $NETWORK_INTERFACE -i v-eth$UE_NUMBER -j ACCEPT
 sudo iptables -D FORWARD -i $NETWORK_INTERFACE -o v-eth$UE_NUMBER -j ACCEPT
 sudo iptables -t nat -D POSTROUTING -s $UE_SUBNET_FIRST_3_OCTETS.0/24 -o $NETWORK_INTERFACE -j MASQUERADE

OpenAirInterface_Testbed/User_Equipment/install_scripts/setup_ue_namespace.sh

@@ -33,6 +33,9 @@ echo "# Script: $(realpath "$0")..."
 # Exit immediately if a command fails
 set -e
 
+SCRIPT_DIR=$(dirname "$(realpath "$0")")
+cd "$SCRIPT_DIR"
+
 UE_NUMBER=$1
 
 if [[ -z "$UE_NUMBER" ]]; then
@@ -49,7 +52,9 @@ UE_NAMESPACE="ue$UE_NUMBER"
 
 # Give the UE its own network namespace and configure it to access the host network
 NETWORK_INTERFACE=$(ip route | grep default | awk '{print $5}')
-UE_SUBNET_FIRST_3_OCTETS=10.201.$UE_NUMBER
+# Fetch the base IP using the Python script
+BASE_IP=$(python3 fetch_nth_ip.py 0.10.201.0/24 $((UE_NUMBER - 1)))
+UE_SUBNET_FIRST_3_OCTETS=$(echo $BASE_IP | cut -d. -f2-4)
 UE_HOST_IP=$UE_SUBNET_FIRST_3_OCTETS.1
 UE_NS_IP=$UE_SUBNET_FIRST_3_OCTETS.2
 

OpenAirInterface_Testbed/User_Equipment/run.sh

@@ -76,10 +76,10 @@ fi
 # Function to handle graceful shutdown
 graceful_shutdown() {
     echo "Shutting down UE $UE_NUMBER gracefully..."
-    ./stop.sh
+    "$SCRIPT_DIR/stop.sh" $UE_NUMBER
     exit
 }
-trap graceful_shutdown SIGINT
+trap graceful_shutdown SIGINT SIGTERM SIGQUIT
 
 # Function to update or add configuration properties in .conf files, considering sections and uncommenting if needed
 update_conf() {

OpenAirInterface_Testbed/User_Equipment/run_gdb.sh

@@ -79,7 +79,7 @@ graceful_shutdown() {
     ./stop.sh
     exit
 }
-trap graceful_shutdown SIGINT
+trap graceful_shutdown SIGINT SIGTERM SIGQUIT
 
 # Function to update or add configuration properties in .conf files, considering sections and uncommenting if needed
 update_conf() {