Renamed variable to multihop_gnb

Signed-off-by: Marikkannu, Suresh <[email protected]>

Author: sureshmarikkannu

roles/router/tasks/install.yml

@@ -46,14 +46,14 @@
   template:
     src: roles/router/templates/systemd/10-aether-access.netdev
     dest: "{{ systemd_network_dir }}/10-aether-access.netdev"
-  when: inventory_hostname in groups['master_nodes'] and core.upf.non_isol_N3_nw == false
+  when: inventory_hostname in groups['master_nodes'] and core.upf.multihop_gnb == false
   become: true
 
 - name: copy 20-aether-access.network to {{ systemd_network_dir }}/20-aether-access.network
   template:
     src: roles/router/templates/systemd/20-aether-access.network
     dest: "{{ systemd_network_dir }}/20-aether-access.network"
-  when: inventory_hostname in groups['master_nodes'] and core.upf.non_isol_N3_nw == false
+  when: inventory_hostname in groups['master_nodes'] and core.upf.multihop_gnb == false
   become: true
 
 - name: copy 10-aether-core.netdev to {{ systemd_network_dir }}/10-aether-core.netdev
@@ -135,7 +135,7 @@
     in_interface: "{{ core.data_iface }}"
     out_interface: access
     jump: ACCEPT
-  when: inventory_hostname in groups['master_nodes'] and core.upf.non_isol_N3_nw == false
+  when: inventory_hostname in groups['master_nodes'] and core.upf.multihop_gnb == false
   become: true
 
 - name: "add iptable rule: forward from access to {{ core.data_iface }}"
@@ -144,7 +144,7 @@
     in_interface: access
     out_interface: "{{ core.data_iface }}"
     jump: ACCEPT
-  when: inventory_hostname in groups['master_nodes'] and core.upf.non_isol_N3_nw == false
+  when: inventory_hostname in groups['master_nodes'] and core.upf.multihop_gnb == false
   become: true
 
 - name: "add iptable rule: forward from {{ core.data_iface }} to core"

roles/router/tasks/uninstall.yml

@@ -13,7 +13,7 @@
     out_interface: access
     jump: ACCEPT
     state: absent
-  when: inventory_hostname in groups['master_nodes'] and core.upf.non_isol_N3_nw == false
+  when: inventory_hostname in groups['master_nodes'] and core.upf.multihop_gnb == false
   become: true
   ignore_errors: yes
 
@@ -24,7 +24,7 @@
     out_interface: "{{ core.data_iface }}"
     jump: ACCEPT
     state: absent
-  when: inventory_hostname in groups['master_nodes'] and core.upf.non_isol_N3_nw == false
+  when: inventory_hostname in groups['master_nodes'] and core.upf.multihop_gnb == false
   become: true
   ignore_errors: yes
 
@@ -93,15 +93,15 @@
   file:
     path: "{{ systemd_network_dir }}/20-aether-access.network"
     state: absent
-  when: inventory_hostname in groups['master_nodes'] and core.upf.non_isol_N3_nw == false
+  when: inventory_hostname in groups['master_nodes'] and core.upf.multihop_gnb == false
   become: true
   ignore_errors: yes
 
 - name: delete  {{ systemd_network_dir }}/10-aether-access.netdev
   file:
     path: "{{ systemd_network_dir }}/10-aether-access.netdev"
     state: absent
-  when: inventory_hostname in groups['master_nodes'] and core.upf.non_isol_N3_nw == false
+  when: inventory_hostname in groups['master_nodes'] and core.upf.multihop_gnb == false
   become: true
   ignore_errors: yes
 

vars/main.yml

@@ -13,10 +13,10 @@ core:
     access_subnet: "192.168.252.1/24"	# access subnet & gateway
     core_subnet: "192.168.250.1/24"	# core subnet & gateway
     mode: af_packet			# Options: af_packet or dpdk
-    non_isol_N3_nw: false               # when set to true, access subnet will be same as data_iface
+    multihop_gnb: false                 # when set to true, access subnet will be same as data_iface
     default_upf:
       ip:
-        access: "192.168.252.3"         # when non_isol_N3_nw set to true, make sure to assign IP from same subnet of data_iface
+        access: "192.168.252.3"         # when multihop_gnb set to true, make sure to assign IP from same subnet of data_iface
         core:   "192.168.250.3"
       ue_ip_pool: "172.250.0.0/16"