Minor comment updates related to 5G

deployments/upf-k8s.yaml

@@ -82,16 +82,16 @@ spec:
   - name: routes
     image: omecproject/upf-epc-bess:master-latest
     env:
-    - name: ENB_SUBNET
+    - name: ENB_GNB_SUBNET
       value: '11.1.1.128/25'
-    - name: S1U_GATEWAY
+    - name: S1U_N3_GATEWAY
       value: '198.18.0.1'
-    - name: SGI_GATEWAY
+    - name: SGI_N6_GATEWAY
       value: '198.19.0.1'
     command: ["sh", "-xec"]
     args:
-    - ip route add $ENB_SUBNET via $S1U_GATEWAY;
-      ip route add default via $SGI_GATEWAY metric 110;
+    - ip route add $ENB_GNB_SUBNET via $S1U_N3_GATEWAY;
+      ip route add default via $SGI_N6_GATEWAY metric 110;
     securityContext:
       capabilities:
         add:

docs/CNDP_README.md

@@ -153,7 +153,7 @@ index 5c2fdaf..8d7b8da 100644
              "busy_poll": true,
 ```
 
-5) Modify the script [docker_setup.sh](../scripts/docker_setup.sh) and update the access and core interface names (s1u, sgi), access/core interface mac addresses and neighbor gateway interfaces mac addresses. This should match the access/core netdev interface name used in jsonc file in previous step. In our example test setup, neighbor mac address (n-s1u, n-sgi) corresponds to access/core interfaces used by packet generator in system 2 to send/receive n/w packets. Update following values based on your system configuration.
+5) Modify the script [docker_setup.sh](../scripts/docker_setup.sh) and update the access and core interface names (s1u/n3, sgi/n6), access/core interface mac addresses and neighbor gateway interfaces mac addresses. This should match the access/core netdev interface name used in jsonc file in previous step. In our example test setup, neighbor mac address (n-s1u/n3, n-sgi/n6) corresponds to access/core interfaces used by packet generator in system 2 to send/receive n/w packets. Update following values based on your system configuration.
 
 ```
 diff --git a/scripts/docker_setup.sh b/scripts/docker_setup.sh
@@ -163,7 +163,7 @@ index 7aff6a6..09d640b 100755
 @@ -24,7 +24,7 @@ mode="dpdk"
  # Gateway interface(s)
  #
- # In the order of ("s1u" "sgi")
+ # In the order of ("s1u/n3" "sgi/n6")
 -ifaces=("ens803f2" "ens803f3")
 +ifaces=("enp134s0" "enp136s0")
 
@@ -172,7 +172,7 @@ index 7aff6a6..09d640b 100755
 @@ -34,7 +34,7 @@ ipaddrs=(198.18.0.1/30 198.19.0.1/30)
  # MAC addresses of gateway interface(s)
  #
- # In the order of (s1u sgi)
+ # In the order of (s1u/n3 sgi/n6)
 -macaddrs=(9e:b2:d3:34:ab:27 c2:9c:55:d4:8a:f6)
 +macaddrs=(40:a6:b7:78:3f:ec 40:a6:b7:78:3f:e8)
 
@@ -181,7 +181,7 @@ index 7aff6a6..09d640b 100755
 @@ -44,7 +44,7 @@ nhipaddrs=(198.18.0.2 198.19.0.2)
  # Static MAC addresses of the neighbors of gateway interface(s)
  #
- # In the order of (n-s1u n-sgi)
+ # In the order of (n-s1u/n3 n-sgi/n6)
 -nhmacaddrs=(22:53:7a:15:58:50 22:53:7a:15:58:50)
 +nhmacaddrs=(40:a6:b7:78:3f:bc 40:a6:b7:78:3f:b8)
 ```

docs/INSTALL.md

@@ -156,31 +156,31 @@ To configure/install the UPF in AF_PACKET mode, the following changes are requir
 
      # Gateway interface(s)
      #
-     # In the order of ("s1u" "sgi")
+     # In the order of ("s1u/n3" "sgi/n6")
     -ifaces=("ens803f2" "ens803f3")
     +ifaces=("ens801f0" "ens801f1")
 
      # Static IP addresses of gateway interface(s) in cidr format
      #
-     # In the order of (s1u sgi)
+     # In the order of (s1u/n3 sgi/n6)
     -ipaddrs=(198.18.0.1/30 198.19.0.1/30)
     +ipaddrs=(198.168.0.1/24 198.168.1.1/24)
 
      # MAC addresses of gateway interface(s)
      #
-     # In the order of (s1u sgi)
+     # In the order of (s1u/n3 sgi/n6)
     -macaddrs=(9e:b2:d3:34:ab:27 c2:9c:55:d4:8a:f6)
     +macaddrs=(b4:96:91:b4:47:b8 b4:96:91:b4:47:b9)
 
      # Static IP addresses of the neighbors of gateway interface(s)
      #
-     # In the order of (n-s1u n-sgi)
+     # In the order of (n-s1u/n3 n-sgi/n6)
     -nhipaddrs=(198.18.0.2 198.19.0.2)
     +nhipaddrs=(198.168.0.2 198.168.1.2)
 
      # Static MAC addresses of the neighbors of gateway interface(s)
      #
-     # In the order of (n-s1u n-sgi)
+     # In the order of (n-s1u/n3 n-sgi/n6)
     -nhmacaddrs=(22:53:7a:15:58:50 22:53:7a:15:58:50)
     +nhmacaddrs=(b4:96:91:b4:44:b0 b4:96:91:b4:44:b1)
 
@@ -207,7 +207,7 @@ To configure/install the UPF in DPDK mode, the following changes are required:
     @@ -32,7 +32,7 @@ ipaddrs=(198.18.0.1/30 198.19.0.1/30)
      # MAC addresses of gateway interface(s)
      #
-     # In the order of (s1u sgi)
+     # In the order of (s1u/n3 sgi/n6)
     -macaddrs=(9e:b2:d3:34:ab:27 c2:9c:55:d4:8a:f6)
     +macaddrs=(b4:96:91:b1:ff:f0 b4:96:91:b1:ff:f1)
 
@@ -216,7 +216,7 @@ To configure/install the UPF in DPDK mode, the following changes are required:
     @@ -42,7 +42,7 @@ nhipaddrs=(198.18.0.2 198.19.0.2)
      # Static MAC addresses of the neighbors of gateway interface(s)
      #
-     # In the order of (n-s1u n-sgi)
+     # In the order of (n-s1u/n3 n-sgi/n6)
     -nhmacaddrs=(22:53:7a:15:58:50 22:53:7a:15:58:50)
     +nhmacaddrs=(b4:96:91:b4:47:b8 b4:96:91:b4:47:b9)
 

ptf/config/docker_setup.sh

@@ -21,40 +21,40 @@ mode="dpdk"
 
 # Gateway interface(s)
 #
-# In the order of ("s1u" "sgi")
+# In the order of ("s1u/n3" "sgi/n6")
 # ifaces=("access" "core")
 ifaces=("core" "access")
 # ifaces=("enp3s0f0" "enp3s0f1")
 
 # Static IP addresses of gateway interface(s) in cidr format
 #
-# In the order of (s1u sgi)
+# In the order of (s1u/n3 sgi/n6)
 ipaddrs=(198.18.0.1/30 198.19.0.1/30)
 
 # MAC addresses of gateway interface(s)
 #
-# In the order of (s1u sgi)
+# In the order of (s1u/n3 sgi/n6)
 macaddrs=(0c:c4:7a:19:6d:ca 0c:c4:7a:19:6d:cb)
 
 # Static IP addresses of the neighbors of gateway interface(s)
 #
-# In the order of (n-s1u n-sgi)
+# In the order of (n-s1u/n3 n-sgi/n6)
 nhipaddrs=(198.18.0.2 198.19.0.2)
 
 # Static MAC addresses of the neighbors of gateway interface(s)
 #
-# In the order of (n-s1u n-sgi)
+# In the order of (n-s1u/n3 n-sgi/n6)
 nhmacaddrs=(22:53:7a:15:58:50 22:53:7a:15:58:50)
 
 # IPv4 route table entries in cidr format per port
 #
-# In the order of ("{r-s1u}" "{r-sgi}")
+# In the order of ("{r-s1u/n3}" "{r-sgi/n6}")
 routes=("11.1.1.128/25" "0.0.0.0/0")
 
 num_ifaces=${#ifaces[@]}
 num_ipaddrs=${#ipaddrs[@]}
 
-# Set up static route and neighbor table entries of the SPGW
+# Set up static route and neighbor table entries of the SPGW/UPF
 function setup_trafficgen_routes() {
 	for ((i = 0; i < num_ipaddrs; i++)); do
 		sudo ip netns exec pause ip neighbor add "${nhipaddrs[$i]}" lladdr "${nhmacaddrs[$i]}" dev "${ifaces[$i % num_ifaces]}"

scripts/docker_setup.sh

@@ -23,38 +23,38 @@ mode="dpdk"
 
 # Gateway interface(s)
 #
-# In the order of ("s1u" "sgi")
+# In the order of ("s1u/n3" "sgi/n6")
 ifaces=("ens803f2" "ens803f3")
 
 # Static IP addresses of gateway interface(s) in cidr format
 #
-# In the order of (s1u sgi)
+# In the order of (s1u/n3 sgi/n6)
 ipaddrs=(198.18.0.1/30 198.19.0.1/30)
 
 # MAC addresses of gateway interface(s)
 #
-# In the order of (s1u sgi)
+# In the order of (s1u/n3 sgi/n6)
 macaddrs=(9e:b2:d3:34:ab:27 c2:9c:55:d4:8a:f6)
 
 # Static IP addresses of the neighbors of gateway interface(s)
 #
-# In the order of (n-s1u n-sgi)
+# In the order of (n-s1u/n3 n-sgi/n6)
 nhipaddrs=(198.18.0.2 198.19.0.2)
 
 # Static MAC addresses of the neighbors of gateway interface(s)
 #
-# In the order of (n-s1u n-sgi)
+# In the order of (n-s1u/n3 n-sgi/n6)
 nhmacaddrs=(22:53:7a:15:58:50 22:53:7a:15:58:50)
 
 # IPv4 route table entries in cidr format per port
 #
-# In the order of ("{r-s1u}" "{r-sgi}")
+# In the order of ("{r-s1u/n3}" "{r-sgi/n6}")
 routes=("11.1.1.128/25" "0.0.0.0/0")
 
 num_ifaces=${#ifaces[@]}
 num_ipaddrs=${#ipaddrs[@]}
 
-# Set up static route and neighbor table entries of the SPGW
+# Set up static route and neighbor table entries of the SPGW/UPF
 function setup_trafficgen_routes() {
 	for ((i = 0; i < num_ipaddrs; i++)); do
 		sudo ip netns exec pause ip neighbor add "${nhipaddrs[$i]}" lladdr "${nhmacaddrs[$i]}" dev "${ifaces[$i % num_ifaces]}"