Merge pull request #24 from mbilal92/master

Parameterize the default UPF values

Author: llpeterson

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

@@ -219,13 +219,13 @@ omec-user-plane:
         cniPlugin: macvlan  # Can be any other plugin. Dictates how IP address are assigned
         iface: {{ core.data_iface }}
         gateway: 192.168.252.1
-        ip: 192.168.252.3/24
+        ip: {{ core.upf.default_upf.ip.access }}
       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: 192.168.250.3/24
+        ip: {{ core.upf.default_upf.ip.core }} 
       cfgFiles:
         upf.jsonc:
           mode: af_packet                # This mode implies no DPDK
@@ -239,7 +239,7 @@ omec-user-plane:
             hostname: "upf"
             #http_port: "8080"
             enable_ue_ip_alloc: false    # If true, UPF allocates address from following pool
-            ue_ip_pool: "172.250.0.0/16" # IP pool used UEs if enable_ue_ip_alloc=true
+            ue_ip_pool: {{ core.upf.default_upf.ue_ip_pool }} # IP pool used UEs if enable_ue_ip_alloc=true
           slice_rate_limit_config:       # Slice-level rate limiting (also controlled by ROC)
             # Uplink
             n6_bps: 10000000000          # 10Gbps

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

@@ -247,8 +247,8 @@ omec-sub-provision:
                 mtu: 1460                     # Value is sent to UE when PDU Session Established
                 ue-ip-pool: "172.250.1.0/16"  # IP address pool for subscribers
                 ue-dnn-qos:
-                  dnn-mbr-downlink: 1000       # UE level downlink QoS (Maximum bit rate per UE)
-                  dnn-mbr-uplink:   1000       # UE level uplink QoS (Maximum bit rate per UE)
+                  dnn-mbr-downlink: 1000      # UE level downlink QoS (Maximum bit rate per UE)
+                  dnn-mbr-uplink:   1000      # UE level uplink QoS (Maximum bit rate per UE)
                   bitrate-unit: Mbps          # Unit for above QoS rates
                   traffic-class:              # Default bearer QCI/ARP (not used in 5G)
                     name: "platinum"
@@ -326,14 +326,14 @@ omec-user-plane:
         iface: {{ core.data_iface }}
         resourceName: "intel.com/intel_sriov_vfio_access"
         gateway: 192.168.252.1
-        ip: 192.168.252.3/24
+        ip: {{ core.upf.default_upf.ip.access }}
       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: 192.168.250.3/24
+        ip: {{ core.upf.default_upf.ip.core }} 
       cfgFiles:
         upf.jsonc:
           mode: dpdk
@@ -352,7 +352,7 @@ omec-user-plane:
             hostname: "upf"
             #http_port: "8080"
             enable_ue_ip_alloc: false    # If true, UPF allocates address from following pool
-            ue_ip_pool: "172.250.0.0/16" # IP pool used UEs if enable_ue_ip_alloc=true
+            ue_ip_pool: {{ core.upf.default_upf.ue_ip_pool }} # IP pool used UEs if enable_ue_ip_alloc=true
           slice_rate_limit_config:       # Slice-level rate limiting (also controlled by ROC)
             # Uplink
             n6_bps: 10000000000          # 10Gbps

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

@@ -324,13 +324,13 @@ omec-user-plane:
         cniPlugin: macvlan  # Can be any other plugin. Dictates how IP address are assigned
         iface: {{ core.data_iface }}
         gateway: 192.168.252.1
-        ip: 192.168.252.3/24
+        ip: {{ core.upf.default_upf.ip.access }}
       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: 192.168.250.3/24
+        ip: {{ core.upf.default_upf.ip.core }} 
       cfgFiles:
         upf.jsonc:
           mode: af_packet                # This mode implies no DPDK
@@ -344,7 +344,7 @@ omec-user-plane:
             hostname: "upf"
             #http_port: "8080"
             enable_ue_ip_alloc: false    # If true, UPF allocates address from following pool
-            ue_ip_pool: "172.250.0.0/16" # IP pool used UEs if enable_ue_ip_alloc=true
+            ue_ip_pool: {{ core.upf.default_upf.ue_ip_pool }} # IP pool used UEs if enable_ue_ip_alloc=true
           slice_rate_limit_config:       # Slice-level rate limiting (also controlled by ROC)
             # Uplink
             n6_bps: 10000000000          # 10Gbps