Merge pull request #107 from free5gc/fix/ut-failed

fix: unit test failed
free5gc · May 21, 2024 · 8c1d9b6 · 8c1d9b6
2 parents 6769b6f + 5e7392f
commit 8c1d9b6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/internal/context/context.go b/internal/context/context.go
@@ -87,8 +87,10 @@ type SMFContext struct {
 }
 
 func GenerateChargingID() int32 {
-	if id, err := smfContext.ChargingIDGenerator.Allocate(); err == nil {
-		return int32(id)
+	if smfContext.ChargingIDGenerator != nil {
+		if id, err := smfContext.ChargingIDGenerator.Allocate(); err == nil {
+			return int32(id)
+		}
 	}
 	return 0
 }

diff --git a/internal/context/sm_context.go b/internal/context/sm_context.go
@@ -324,7 +324,8 @@ func NewSMContext(id string, pduSessID int32) *SMContext {
 	smContext.ChargingInfo = make(map[uint32]*ChargingInfo)
 	smContext.ChargingID = GenerateChargingID()
 
-	if factory.SmfConfig.Configuration != nil {
+	if factory.SmfConfig != nil &&
+		factory.SmfConfig.Configuration != nil {
 		smContext.UrrReportTime = time.Duration(factory.SmfConfig.Configuration.UrrPeriod) * time.Second
 		smContext.UrrReportThreshold = factory.SmfConfig.Configuration.UrrThreshold
 		logger.CtxLog.Infof("UrrPeriod: %v", smContext.UrrReportTime)

diff --git a/internal/context/sm_context_policy_test.go b/internal/context/sm_context_policy_test.go
@@ -671,6 +671,12 @@ func TestApplyPccRules(t *testing.T) {
 		},
 	}
 	smctx.SelectedSessionRuleID = "SessRuleId-1"
+	smctx.DnnConfiguration = models.DnnConfiguration{
+		SessionAmbr: &models.Ambr{
+			Uplink:   "1 Gbps",
+			Downlink: "1 Gbps",
+		},
+	}
 	err := smctx.AllocUeIP()
 	require.NoError(t, err)
 	err = smctx.SelectDefaultDataPath()