Feature: Support Converged Charging

internal/context/datapath.go

@@ -385,32 +385,43 @@ func (node DataPathNode) addUrrToNode(smContext *SMContext, urrId uint32, isMeas
 	}
 }
 
+// Add reserve urr to datapath UPF
 func (datapath *DataPath) addUrrToPath(smContext *SMContext) {
 	if smContext.UrrReportTime == 0 && smContext.UrrReportThreshold == 0 {
 		logger.PduSessLog.Errorln("URR Report time and threshold is 0")
 		return
 	}
 
 	for curDataPathNode := datapath.FirstDPNode; curDataPathNode != nil; curDataPathNode = curDataPathNode.Next() {
-		var MBQEUrrId int64
-		var MAQEUrrId int64
-		var err error
-		// If more than two data path will use the same UPF
-		// It may cause urr be created multiple times
-		// There may be some mechanism to make sure that existed URR should not be create again
+		var MBQEUrrId uint32
+		var MAQEUrrId uint32
+
 		if curDataPathNode.IsANUPF() {
-			MBQEUrrId, err = curDataPathNode.UPF.urrIDGenerator.Allocate()
-			if err != nil {
-				logger.CtxLog.Warnf("MBQE URR ID allocate error: %v\n", err)
-			}
-			MAQEUrrId, err = curDataPathNode.UPF.urrIDGenerator.Allocate()
-			if err != nil {
-				logger.CtxLog.Warnf("MAQE URR ID allocate error: %v\n", err)
+			if curDataPathNode.Next() == nil {
+				MBQEUrrId = smContext.UrrIdMap[N3N6_MBQE_URR]
+				MAQEUrrId = smContext.UrrIdMap[N3N6_MAQE_URR]
+			} else {
+				MBQEUrrId = smContext.UrrIdMap[N3N9_MBQE_URR]
+				MAQEUrrId = smContext.UrrIdMap[N3N9_MAQE_URR]
 			}
+		} else {
+			MBQEUrrId = smContext.UrrIdMap[N9N6_MBQE_URR]
+			MAQEUrrId = smContext.UrrIdMap[N9N6_MAQE_URR]
 		}
 
-		curDataPathNode.addUrrToNode(smContext, uint32(MBQEUrrId), true, true)
-		curDataPathNode.addUrrToNode(smContext, uint32(MAQEUrrId), true, false)
+		// if curDataPathNode.IsANUPF() {
+		// 	MBQEUrrId, err = curDataPathNode.UPF.urrIDGenerator.Allocate()
+		// 	if err != nil {
+		// 		logger.CtxLog.Warnf("MBQE URR ID allocate error: %v\n", err)
+		// 	}
+		// 	MAQEUrrId, err = curDataPathNode.UPF.urrIDGenerator.Allocate()
+		// 	if err != nil {
+		// 		logger.CtxLog.Warnf("MAQE URR ID allocate error: %v\n", err)
+		// 	}
+		// }
+
+		curDataPathNode.addUrrToNode(smContext, MBQEUrrId, true, true)
+		curDataPathNode.addUrrToNode(smContext, MAQEUrrId, true, false)
 	}
 }
 
@@ -771,7 +782,8 @@ func (p *DataPath) AddChargingRules(smContext *SMContext, chgLevel ChargingLevel
 				UpfId:         node.UPF.UUID(),
 			}
 
-			urrId, err := node.UPF.urrIDGenerator.Allocate()
+			// urrId, err := node.UPF.urrIDGenerator.Allocate()
+			urrId, err := smContext.UrrIDGenerator.Allocate()
 			if err != nil {
 				logger.PduSessLog.Errorln("Generate URR Id failed")
 				return

internal/context/sm_context.go

@@ -3,6 +3,7 @@ package context
 import (
 	"context"
 	"fmt"
+	"math"
 	"net"
 	"net/http"
 	"strings"
@@ -45,6 +46,22 @@ const (
 
 type UrrType int
 
+// Reserved URR report for ID = 0 ~ 6
+const (
+	N3N6_MBQE_URR UrrType = iota
+	N3N6_MAQE_URR
+	N3N9_MBQE_URR
+	N3N9_MAQE_URR
+	N9N6_MBQE_URR
+	N9N6_MAQE_URR
+	NOT_FOUND_URR
+)
+
+func (t UrrType) String() string {
+	urrTypeList := []string{"N3N6_MBQE", "N3N6_MAQE", "N3N9_MBQE", "N3N9_MAQE", "N9N6_MBQE", "N9N6_MAQE"}
+	return urrTypeList[t]
+}
+
 func (t UrrType) IsBeforeQos() bool {
 	urrTypeList := []bool{true, false, true, false, true, false}
 	return urrTypeList[t]
@@ -181,7 +198,7 @@ type SMContext struct {
 	AdditonalQosFlows       map[uint8]*QoSFlow // Key: qfi
 
 	// URR
-	// UrrIDGenerator     *idgenerator.IDGenerator // should be deprecated
+	UrrIDGenerator     *idgenerator.IDGenerator
 	UrrIdMap           map[UrrType]uint32
 	UrrUpfMap          map[string]*URR
 	UrrReportTime      time.Duration
@@ -282,9 +299,9 @@ func NewSMContext(id string, pduSessID int32) *SMContext {
 	smContext.AMBRQerMap = make(map[uuid.UUID]uint32)
 	smContext.QerUpfMap = make(map[string]uint32)
 	smContext.AdditonalQosFlows = make(map[uint8]*QoSFlow)
-	// smContext.UrrIDGenerator = idgenerator.NewGenerator(1, math.MaxUint32)
+	smContext.UrrIDGenerator = idgenerator.NewGenerator(1, math.MaxUint32)
 	smContext.UrrIdMap = make(map[UrrType]uint32)
-	// smContext.GenerateUrrId()
+	smContext.GenerateUrrId()
 	smContext.UrrUpfMap = make(map[string]*URR)
 
 	smContext.ChargingInfo = make(map[uint32]*ChargingInfo)
@@ -361,6 +378,27 @@ func GetSMContextBySEID(SEID uint64) *SMContext {
 	return nil
 }
 
+func (smContext *SMContext) GenerateUrrId() {
+	if id, err := smContext.UrrIDGenerator.Allocate(); err == nil {
+		smContext.UrrIdMap[N3N6_MBQE_URR] = uint32(id)
+	}
+	if id, err := smContext.UrrIDGenerator.Allocate(); err == nil {
+		smContext.UrrIdMap[N3N6_MAQE_URR] = uint32(id)
+	}
+	if id, err := smContext.UrrIDGenerator.Allocate(); err == nil {
+		smContext.UrrIdMap[N9N6_MBQE_URR] = uint32(id)
+	}
+	if id, err := smContext.UrrIDGenerator.Allocate(); err == nil {
+		smContext.UrrIdMap[N9N6_MAQE_URR] = uint32(id)
+	}
+	if id, err := smContext.UrrIDGenerator.Allocate(); err == nil {
+		smContext.UrrIdMap[N3N9_MBQE_URR] = uint32(id)
+	}
+	if id, err := smContext.UrrIDGenerator.Allocate(); err == nil {
+		smContext.UrrIdMap[N3N9_MAQE_URR] = uint32(id)
+	}
+}
+
 func (smContext *SMContext) BuildCreatedData() *models.SmContextCreatedData {
 	return &models.SmContextCreatedData{
 		SNssai: smContext.SNssai,