make updates

ansible_workspace/staging/host_vars/ESXI-1/esxi.yaml

@@ -8,5 +8,5 @@ vswitches:
 portgroups:
 - { vSwitch: GAF_VSWITCH, vlanId: 501, vlanName: GAF_BP_501_OAM }
 - { vSwitch: GAF_VSWITCH, vlanId: 502, vlanName: GAF_BP_502_RAN }
-- { vSwitch: GAF_VSWITCH, vlanId: 10, vlanName: DN_01 }
+- { vSwitch: GAF_VSWITCH, vlanId: 5, vlanName: DN_01 }
 - { vSwitch: GAF_VSWITCH, vlanId: 4095, vlanName: GAF_BP_T_510_515 }

ansible_workspace/staging/host_vars/GBP08-AIO-1/aio_3gpp.yaml

@@ -39,29 +39,65 @@ _ngc_ext_aio_transport:
 
 # RAN transports (use RAN IP)
 - action: override_amf_n2_transport
-  params: { address: 172.29.20.25, vrf: RAN }
+  params: { address: 10.5.19.195, vrf: RAN }
 - action: override_mme_transport
-  params: { s1_address: 172.29.20.25, s1_vrf: RAN }
+  params: { s1_address: 10.5.19.195, s1_vrf: RAN }
 
 # UPF transports (N3 on RAN)
 - action: override_upf_transport
   params:
     n3_interface: eth1
-    n3_address: 172.29.20.25
+    n3_address: 10.5.19.195
     n3_vrf: RAN
 
+# Avoid s-NSSAI on PFCP
+- action: set_pfcp_ies
+  params:
+    s_nssai: false
+
+# Definition of Network Instances for PFCP
+- action: set_pfcp_net_instances
+  params:
+    s1_u: RAN
+    s5s8_u: TELCO
+    s11_u: TELCO
+    n3: RAN
+    n4_u: TELCO
+
+# DNN configuration
+_ngc_ext_aio_dnn:
+
+# internet DNN (5G Selection)
+- action: add_smf_dnn
+  params:
+    dnn: internet
+    n6_vrf: DN_01
+    dns:
+    - 8.8.8.8
+
+# internet DNN (LTE Selection)
+- action: add_smf_dnn
+  params:
+    dnn: internet
+    nssai:
+      sd: ''
+      sst: 1
+    n6_vrf: DN_01
+    dns:
+    - 8.8.8.8
+
 # DN/DNN (N6) with UE pool
 - action: add_n6_dnn
   params:
     n6_dnn: internet
     n6_vrf: DN_01
-    n6_vlan: 10
+    n6_vlan: 5
     n6_vrf_table: 511
     n6_interface: eth2
-    n6_ip: 192.168.86.234/24
-    n6_gw: 192.168.86.1
+    n6_ip: 10.5.20.195/24
+    n6_gw: 10.5.20.254
     n6_upf_pools:
-      - upf_route: 100.93.0.0/24
+      - upf_route: 172.16.2.0/24
         nssai: false
     n6_bgp:
       local_as: 65001

ansible_workspace/staging/host_vars/GBP08-AIO-1/aio_networking.yaml

@@ -5,8 +5,8 @@ net_recipe: generic_bgp
 oam_network:
   add_ansible_host_address: false
   addresses:
-    - 192.168.86.54/24
-  gateway4: 192.168.86.1
+    - 10.5.21.54/24
+  gateway4: 10.5.21.254
 
 # --- NTP ---
 ntp:
@@ -27,7 +27,7 @@ _ngc_ext_aio_net:
     interface: eth1
     vrf: RAN
     addresses:
-    - 172.29.20.25/24 # S1+N2+N3
+    - 10.5.19.195/23 # S1+N2+N3
     routes:
     - destination: 0.0.0.0/0
-      gateway: 172.29.20.1
+      gateway: 10.5.19.254

ansible_workspace/staging/hosts.yaml

@@ -1,7 +1,7 @@
 all:
   hosts:
     GBP08-AIO-1:
-      ansible_host: 100.92.0.80
+      ansible_host: 100.93.1.84
   children:
     ESXi:
       hosts: