clean up subnets

Signed-off-by: Larry Peterson <[email protected]>

Author: llpeterson

roles/core/templates/radio-5g-values.yaml

@@ -218,14 +218,14 @@ omec-user-plane:
         ipam: static
         cniPlugin: macvlan  # Can be any other plugin. Dictates how IP address are assigned
         iface: {{ core.data_iface }}
-        gateway: 192.168.252.1
-        ip: {{ core.upf.default_upf.ip.access }}
+        gateway: {{ core.upf.access_subnet[:-3] }}
+        ip: {{ core.upf.access_subnet }}
       core:
         ipam: static
         cniPlugin: macvlan  # Can be any other plugin. Dictates how IP address are assigned
         iface: {{ core.data_iface }}
-        gateway: 192.168.250.1
-        ip: {{ core.upf.default_upf.ip.core }} 
+        gateway: {{ core.upf.core_subnet[:-3] }}
+        ip: {{ core.upf.core_subnet }} 
       cfgFiles:
         upf.jsonc:
           mode: af_packet                # This mode implies no DPDK

roles/core/templates/sdcore-5g-sriov-values.yaml

@@ -325,15 +325,15 @@ omec-user-plane:
         cniPlugin: vfioveth    # Can be any other plugin. Dictates how IP address are assigned
         iface: {{ core.data_iface }}
         resourceName: "intel.com/intel_sriov_vfio_access"
-        gateway: 192.168.252.1
-        ip: {{ core.upf.default_upf.ip.access }}
+        gateway: {{ core.upf.access_subnet[:-3] }}
+        ip: {{ core.upf.access_subnet }}
       core:
         ipam: static
         cniPlugin: vfioveth    # Can be any other plugin. Dictates how IP address are assigned
         iface: {{ core.data_iface }}
         resourceName: "intel.com/intel_sriov_vfio_core"
-        gateway: 192.168.250.1
-        ip: {{ core.upf.default_upf.ip.core }} 
+        gateway: {{ core.upf.core_subnet[:-3] }}
+        ip: {{ core.upf.core_subnet }}
       cfgFiles:
         upf.jsonc:
           mode: dpdk

roles/core/templates/sdcore-5g-values.yaml

@@ -323,14 +323,14 @@ omec-user-plane:
         ipam: static
         cniPlugin: macvlan  # Can be any other plugin. Dictates how IP address are assigned
         iface: {{ core.data_iface }}
-        gateway: 192.168.252.1
-        ip: {{ core.upf.default_upf.ip.access }}
+        gateway: {{ core.upf.access_subnet[:-3] }}
+        ip: {{ core.upf.access_subnet }}
       core:
         ipam: static
         cniPlugin: macvlan  # Can be any other plugin. Dictates how IP address are assigned
         iface: {{ core.data_iface }}
-        gateway: 192.168.250.1
-        ip: {{ core.upf.default_upf.ip.core }} 
+        gateway: {{ core.upf.core_subnet[:-3] }}
+        ip: {{ core.upf.core_subnet }}
       cfgFiles:
         upf.jsonc:
           mode: af_packet                # This mode implies no DPDK

roles/router/tasks/uninstall.yml

@@ -110,7 +110,7 @@
   shell: |
     ip link del access || true
     ip link del core || true
-    iptables -t nat -D POSTROUTING -s 172.250.0.0/16 -o {{ core.data_iface }} -j MASQUERADE || true
+    iptables -t nat -D POSTROUTING -s {{ core.upf.default_upf.ue_ip_pool }} -o {{ core.data_iface }} -j MASQUERADE || true
   when: inventory_hostname in groups['master_nodes']
   become: true
   ignore_errors: yes

roles/router/templates/systemd/20-aether-access.network

@@ -6,4 +6,4 @@ Name=access
 
 [Network]
 IPForward=yes
-Address=192.168.252.1/24
+Address={{ core.upf.access_subnet }}

roles/router/templates/systemd/20-aether-core.network

@@ -6,8 +6,8 @@ Name=core
 
 [Network]
 IPForward=yes
-Address=192.168.250.1/24
+Address={{ core.upf.core_subnet }}
 
 [Route]
-Gateway=192.168.250.3
-Destination=172.250.0.0/16
+Gateway={{ core.upf.default_upf.ip.core }}
+Destination={{ core.upf.default_upf.ue_ip_pool }}

roles/router/templates/systemd/aether-ue-nat.service

@@ -3,7 +3,7 @@
 
 [Service]
 Type=oneshot
-ExecStart=/bin/bash -c "sudo iptables -t nat -C POSTROUTING -s 172.250.0.0/16 -o {{ core.data_iface }} -j MASQUERADE || sudo iptables -t nat -A POSTROUTING -s 172.250.0.0/16 -o {{ core.data_iface }} -j MASQUERADE"
+ExecStart=/bin/bash -c "sudo iptables -t nat -C POSTROUTING -s {{ core.upf.default_upf.ue_ip_pool }} -o {{ core.data_iface }} -j MASQUERADE || sudo iptables -t nat -A POSTROUTING -s {{ core.upf.default_upf.ue_ip_pool }} -o {{ core.data_iface }} -j MASQUERADE"
 
 [Install]
 WantedBy=sys-subsystem-net-devices-core.device

roles/upf/tasks/install.yml

@@ -52,7 +52,7 @@
 
 - name: configure route for upf traffic on gnbsim node
   shell: |
-    ip route add {{ item.value.ue_ip_pool }} via {{ item.value.ip.core[:-3] }}
+    ip route add {{ item.value.ue_ip_pool }} via {{ item.value.ip.core }}
   when: inventory_hostname in groups['master_nodes']
   with_dict: "{{ core.upf.additional_upfs}}"
   become: true

roles/upf/tasks/uninstall.yml

@@ -2,7 +2,7 @@
 
 - name: delete route for upf to UE
   shell: |
-    ip route del {{ item.value.ue_ip_pool }} via {{ item.value.ip.core[:-3] }}
+    ip route del {{ item.value.ue_ip_pool }} via {{ item.value.ip.core }}
   when: inventory_hostname in groups['master_nodes']
   with_dict: "{{ core.upf.additional_upfs}}"
   become: true

roles/upf/templates/upf-5g-values.yaml

@@ -31,13 +31,13 @@ config:
       ipam: static
       cniPlugin: macvlan  # Can be any other plugin. Dictates how IP address are assigned
       iface: {{ core.data_iface }}
-      gateway: 192.168.252.1
+      gateway: {{ core.upf.access_subnet[:-3] }}
       ip: {{ upf_access_ip }}
     core:
       ipam: static
       cniPlugin: macvlan  # Can be any other plugin. Dictates how IP address are assigned
       iface: {{ core.data_iface }}
-      gateway: 192.168.250.1
+      gateway: {{ core.upf.core_subnet[:-3] }}
       ip: {{ upf_core_ip }}
     cfgFiles:
       upf.jsonc: