Feat: Multiple DNN

Signed-off-by: anaswara <[email protected]>

Author: anaswarac-dac

conf/upf.jsonc

@@ -155,7 +155,12 @@
     "cpiface": {
         "peers": ["148.162.12.214"],
         // [Optional] Below parameters
-        "dnn": "internet",
+        "dnn_list": [
+            {
+                "dnn": "internet",
+                "ue_ip_pool": "10.250.0.0/16"
+            }
+        ],
         "http_port": "8080",
         "enable_ue_ip_alloc": false,
         // "use_fqdn": "true",

pfcpiface/config.go

@@ -86,13 +86,18 @@ type SimModeInfo struct {
 
 // CPIfaceInfo : CPIface interface settings.
 type CPIfaceInfo struct {
-	Peers           []string `json:"peers"`
-	UseFQDN         bool     `json:"use_fqdn"`
-	NodeID          string   `json:"hostname"`
-	HTTPPort        string   `json:"http_port"`
-	Dnn             string   `json:"dnn"`
-	EnableUeIPAlloc bool     `json:"enable_ue_ip_alloc"`
-	UEIPPool        string   `json:"ue_ip_pool"`
+	Peers           []string  `json:"peers"`
+	UseFQDN         bool      `json:"use_fqdn"`
+	NodeID          string    `json:"hostname"`
+	HTTPPort        string    `json:"http_port"`
+	DnnList         []DNNInfo `json:"dnn_list"`
+	EnableUeIPAlloc bool      `json:"enable_ue_ip_alloc"`
+	UEIPPool        string    `json:"ue_ip_pool"`
+}
+
+type DNNInfo struct {
+	DNN      string `json:"dnn"`
+	UEIPPool string `json:"ue_ip_pool"`
 }
 
 // IfaceType : Gateway interface struct.
@@ -118,12 +123,12 @@ func validateConf(conf Conf) error {
 		if err != nil {
 			return ErrInvalidArgumentWithReason("conf.P4rtcIface.AccessIP", conf.P4rtcIface.AccessIP, err.Error())
 		}
-
-		_, _, err = net.ParseCIDR(conf.CPIface.UEIPPool)
-		if err != nil {
-			return ErrInvalidArgumentWithReason("conf.UEIPPool", conf.CPIface.UEIPPool, err.Error())
+		for _, dnn := range conf.CPIface.DnnList {
+			_, _, err := net.ParseCIDR(dnn.UEIPPool)
+			if err != nil {
+				return ErrInvalidArgumentWithReason("conf.CPIface.DnnList.UEIPPool", dnn.UEIPPool, err.Error())
+			}
 		}
-
 		if conf.Mode != "" {
 			return ErrInvalidArgumentWithReason("conf.Mode", conf.Mode, "mode must not be set for UP4")
 		}
@@ -140,14 +145,14 @@ func validateConf(conf Conf) error {
 			return ErrInvalidArgumentWithReason("conf.Mode", conf.Mode, "invalid mode")
 		}
 	}
-
 	if conf.CPIface.EnableUeIPAlloc {
-		_, _, err := net.ParseCIDR(conf.CPIface.UEIPPool)
-		if err != nil {
-			return ErrInvalidArgumentWithReason("conf.UEIPPool", conf.CPIface.UEIPPool, err.Error())
+		for _, dnn := range conf.CPIface.DnnList {
+			_, _, err := net.ParseCIDR(dnn.UEIPPool)
+			if err != nil {
+				return ErrInvalidArgumentWithReason("conf.CPIface.DnnList.UEIPPool", dnn.UEIPPool, err.Error())
+			}
 		}
 	}
-
 	for _, peer := range conf.CPIface.Peers {
 		ip := net.ParseIP(peer)
 		if ip == nil {

pfcpiface/fteid.go

@@ -29,6 +29,9 @@ func NewFTEIDGenerator() *FTEIDGenerator {
 
 // Allocate and return an id in range [minValue, maxValue]
 func (idGenerator *FTEIDGenerator) Allocate() (uint32, error) {
+	if idGenerator == nil {
+		return 0, errors.New("FTEIDGenerator is not initialized")
+	}
 	idGenerator.lock.Lock()
 	defer idGenerator.lock.Unlock()
 

pfcpiface/messages_conn.go

@@ -5,6 +5,7 @@ package pfcpiface
 
 import (
 	"errors"
+	"strings"
 
 	"github.com/omec-project/upf-epc/logger"
 	"github.com/wmnsk/go-pfcp/ie"
@@ -92,7 +93,7 @@ func (pConn *PFCPConn) handleIncomingResponse(msg message.Message) {
 
 func (pConn *PFCPConn) associationIEs() []*ie.IE {
 	upf := pConn.upf
-	networkInstance := string(ie.NewNetworkInstanceFQDN(upf.dnn).Payload)
+	networkInstance := string(ie.NewNetworkInstanceFQDN(strings.Join(upf.dnn, ",")).Payload)
 	flags := uint8(0x41)
 
 	if len(upf.dnn) != 0 {

pfcpiface/messages_session.go

@@ -94,6 +94,10 @@ func (pConn *PFCPConn) handleSessionEstablishmentRequest(msg message.Message) (m
 
 		if p.UPAllocateFteid {
 			var fteid uint32
+			if pConn.upf.fteidGenerator == nil {
+				logger.PfcpLog.Warnf("fteid is nill")
+				pConn.upf.fteidGenerator = NewFTEIDGenerator()
+			}
 			fteid, err = pConn.upf.fteidGenerator.Allocate()
 			if err != nil {
 				return errProcessReply(err, ie.CauseNoResourcesAvailable)

pfcpiface/up4.go

@@ -404,7 +404,11 @@ func (up4 *UP4) SetUpfInfo(u *upf, conf *Conf) {
 
 	logger.PfcpLog.Infof("AccessIP: %v", up4.accessIP)
 
-	up4.ueIPPool = MustParseStrIP(conf.CPIface.UEIPPool)
+	if len(conf.CPIface.DnnList) > 0 {
+		up4.ueIPPool = MustParseStrIP(conf.CPIface.DnnList[0].UEIPPool)
+	} else {
+		logger.PfcpLog.Fatalln("No UE IP pool configured in DnnList")
+	}
 
 	logger.PfcpLog.Infof("UE IP pool: %v", up4.ueIPPool)
 

pfcpiface/upf.go

@@ -48,7 +48,7 @@ type upf struct {
 	nodeID            string
 	ippool            *IPPool
 	peers             []string
-	dnn               string
+	dnn               []string
 	reportNotifyChan  chan uint64
 	sliceInfo         *SliceInfo
 	readTimeout       time.Duration
@@ -116,17 +116,28 @@ func NewUPF(conf *Conf, fp datapath) *upf {
 		nodeID = hosts[0]
 	}
 
+	var dnns []string
+	var ippoolCidr string
+
+	// Extract DNN names and UEIPPool from the new DnnList structure
+	for _, dnnInfo := range conf.CPIface.DnnList {
+		dnns = append(dnns, dnnInfo.DNN)
+		if ippoolCidr == "" {
+			ippoolCidr = dnnInfo.UEIPPool
+		}
+	}
+
 	u := &upf{
 		enableUeIPAlloc:   conf.CPIface.EnableUeIPAlloc,
 		enableEndMarker:   conf.EnableEndMarker,
 		enableFlowMeasure: conf.EnableFlowMeasure,
 		enableGtpuMonitor: conf.EnableGtpuPathMonitoring,
 		accessIface:       conf.AccessIface.IfName,
 		coreIface:         conf.CoreIface.IfName,
-		ippoolCidr:        conf.CPIface.UEIPPool,
+		ippoolCidr:        ippoolCidr,
 		nodeID:            nodeID,
 		datapath:          fp,
-		dnn:               conf.CPIface.Dnn,
+		dnn:               dnns,
 		peers:             conf.CPIface.Peers,
 		reportNotifyChan:  make(chan uint64, 1024),
 		maxReqRetries:     conf.MaxReqRetries,

ptf/config/upf.jsonc

@@ -155,7 +155,12 @@
     "cpiface": {
         "peers": ["148.162.12.214"],
         // [Optional] Below parameters
-        "dnn": "internet",
+        "dnn_list": [
+            {
+                "dnn": "internet",
+                "ue_ip_pool": "10.250.0.0/16"
+            }
+        ],
         "http_port": "8080",
         "enable_ue_ip_alloc": false,
         // "use_fqdn": "true",

test/integration/conf.go

@@ -57,9 +57,12 @@ func BESSConfigUPFBasedIPAllocation() pfcpiface.Conf {
 	config := BESSConfigDefault()
 	config.CPIface = pfcpiface.CPIfaceInfo{
 		EnableUeIPAlloc: true,
-		UEIPPool:        UEPoolUPF,
+		DnnList: []pfcpiface.DNNInfo{
+			{
+				UEIPPool: UEPoolUPF,
+			},
+		},
 	}
-
 	return config
 }
 
@@ -87,7 +90,11 @@ func UP4ConfigDefault() pfcpiface.Conf {
 	}
 
 	config.CPIface = pfcpiface.CPIfaceInfo{
-		UEIPPool: UEPoolCP,
+		DnnList: []pfcpiface.DNNInfo{
+			{
+				UEIPPool: UEPoolCP,
+			},
+		},
 	}
 
 	return config
@@ -97,7 +104,11 @@ func UP4ConfigUPFBasedIPAllocation() pfcpiface.Conf {
 	config := UP4ConfigDefault()
 	config.CPIface = pfcpiface.CPIfaceInfo{
 		EnableUeIPAlloc: true,
-		UEIPPool:        UEPoolUPF,
+		DnnList: []pfcpiface.DNNInfo{
+			{
+				UEIPPool: UEPoolUPF,
+			},
+		},
 	}
 
 	return config