diff --git a/ansible_workspace/staging/host_vars/ESXI-1/esxi.yaml b/ansible_workspace/staging/host_vars/ESXI-1/esxi.yaml index 25501b5..1612f50 100644 --- a/ansible_workspace/staging/host_vars/ESXI-1/esxi.yaml +++ b/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 } \ No newline at end of file diff --git a/ansible_workspace/staging/host_vars/GBP08-AIO-1/aio_3gpp.yaml b/ansible_workspace/staging/host_vars/GBP08-AIO-1/aio_3gpp.yaml index e251c4d..5465361 100644 --- a/ansible_workspace/staging/host_vars/GBP08-AIO-1/aio_3gpp.yaml +++ b/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 diff --git a/ansible_workspace/staging/host_vars/GBP08-AIO-1/aio_networking.yaml b/ansible_workspace/staging/host_vars/GBP08-AIO-1/aio_networking.yaml index c6e1115..17e9288 100644 --- a/ansible_workspace/staging/host_vars/GBP08-AIO-1/aio_networking.yaml +++ b/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 \ No newline at end of file + gateway: 10.5.19.254 \ No newline at end of file diff --git a/ansible_workspace/staging/hosts.yaml b/ansible_workspace/staging/hosts.yaml index 79be35f..4c2cb64 100644 --- a/ansible_workspace/staging/hosts.yaml +++ b/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: diff --git a/auth_utils.py b/auth_utils.py index 1ecaa76..a9c513e 100644 --- a/auth_utils.py +++ b/auth_utils.py @@ -36,6 +36,7 @@ def get_vpn_dashboard_token(base_url): credentials = { "user": "admin@hpe.com", "password": "JohnWayne#21", + # "user": "admin@hpe.com", "password": "administratoR!1", # "user": "admin@athonet.com", "password": "administratoR!1", "lang": "en", "auth_provider": "enterprise" } diff --git a/system_info.json b/system_info.json index 726ab3d..a6b7975 100644 --- a/system_info.json +++ b/system_info.json @@ -16,7 +16,7 @@ "machine_id": "7ebd37b3c5a44ff7acafc84fa3af449d", "num_cpu": 4, "virtualization": "kvm", - "target_host_ip": "100.92.0.238", + "target_host_ip": "100.93.1.84", "mgmt": { "cidr": "192.168.105.156/24", "gw": "192.168.105.1" diff --git a/templates/ansible_templates/aio_3gpp.yaml.j2 b/templates/ansible_templates/aio_3gpp.yaml.j2 index ff216d5..958e2a3 100644 --- a/templates/ansible_templates/aio_3gpp.yaml.j2 +++ b/templates/ansible_templates/aio_3gpp.yaml.j2 @@ -50,6 +50,42 @@ _ngc_ext_aio_transport: n3_address: {{ ran.ip }} 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: diff --git a/templates/pages/gaf_desk.html b/templates/pages/gaf_desk.html index 9f92614..081949e 100644 --- a/templates/pages/gaf_desk.html +++ b/templates/pages/gaf_desk.html @@ -399,7 +399,7 @@ document.getElementById('btn-create-yaml').addEventListener('click', async () => }, inventory_host: 'GBP08-AIO-1', esxi_host: 'ESXI-1', - version: '25.1', + version: '25.x', ova_file: '/home/mjensen/OVA/HPE_ANW_P5G_Core-1.25.1.1-qemux86-64.ova', // Make sure backend knows which host to use; it will read the fresh snapshot @@ -416,9 +416,14 @@ document.getElementById('btn-create-yaml').addEventListener('click', async () => const j = await res.json(); if (!res.ok || !j.ok) throw new Error(j.error || `HTTP ${res.status}`); + console.log('YAML creation response:', j); document.getElementById('yaml-badge').textContent = 'Created'; document.getElementById('yaml-badge').className = 'badge bg-success'; - alert(`YAML files created in: ${j.staging}`); + if (j.staging) { + alert(`YAML files created in: ${j.staging}`); + } else { + alert('YAML files created, but staging path is missing in response.'); + } } catch (err) { console.error('Error creating YAML:', err); document.getElementById('yaml-badge').textContent = 'Failed';