Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add charging data when traffic steering #41

Merged
merged 4 commits into from
Feb 23, 2025
Merged

Add charging data when traffic steering #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6b1455
feat: add charging data for traffic influence
lyz508 Jan 21, 2025
a0c9754
feat: add charging data when updating traffic influence data
lyz508 Jan 22, 2025
0d79816
fix: ci-linter error
ianchen0119 Feb 23, 2025
9bdae2b
fix: gofumpt err
ianchen0119 Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 60 additions & 2 deletions internal/sbi/processor/notifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ import (
"strings"

"github.com/gin-gonic/gin"
"go.mongodb.org/mongo-driver/bson"

"github.com/free5gc/openapi/models"
"github.com/free5gc/pcf/internal/logger"
"github.com/free5gc/pcf/internal/util"
"github.com/free5gc/util/mongoapi"
)

func (p *Processor) HandleAmfStatusChangeNotify(
Expand Down Expand Up @@ -74,16 +76,72 @@ func (p *Processor) HandleInfluenceDataUpdateNotify(
}
delete(influenceDataToPccRule, influenceID)
} else {
var chgData *models.ChargingData
var chargingInterface map[string]interface{}

trafficInfluData := *notification.TrafficInfluData

filterCharging := bson.M{
"ueId": ue.Supi,
"snssai": util.SnssaiModelsToHex(*trafficInfluData.Snssai),
"dnn": "",
"filter": "",
}
chargingInterface, err := mongoapi.RestfulAPIGetOne(chargingDataColl, filterCharging, 2)
if err != nil {
logger.SmPolicyLog.Errorf("Fail to get charging data to mongoDB err: %+v", err)
chgData = nil
} else if chargingInterface != nil {
rg, err1 := p.Context().RatingGroupIdGenerator.Allocate()
if err1 != nil {
logger.SmPolicyLog.Error("rating group allocate error")
problemDetails := util.GetProblemDetail("rating group allocate error", util.ERROR_IDGENERATOR)
c.JSON(int(problemDetails.Status), problemDetails)
return
}
chgData = &models.ChargingData{
ChgId: util.GetChgId(smPolicy.ChargingIdGenerator),
RatingGroup: int32(rg),
ReportingLevel: models.ReportingLevel_RAT_GR_LEVEL,
MeteringMethod: models.MeteringMethod_VOLUME,
}

switch chargingInterface["chargingMethod"].(string) {
case "Online":
chgData.Online = true
chgData.Offline = false
case "Offline":
chgData.Online = false
chgData.Offline = true
}

if decision.ChgDecs == nil {
decision.ChgDecs = make(map[string]*models.ChargingData)
}

chargingInterface["ratingGroup"] = chgData.RatingGroup
logger.SmPolicyLog.Tracef("put ratingGroup[%+v] for [%+v] to MongoDB", chgData.RatingGroup, ue.Supi)
if _, err = mongoapi.RestfulAPIPutOne(
chargingDataColl, chargingInterface, chargingInterface, 2); err != nil {
logger.SmPolicyLog.Errorf("Fail to put charging data to mongoDB err: %+v", err)
} else {
smPolicy.ChargingIdGenerator++
}
if ue.RatingGroupData == nil {
ue.RatingGroupData = make(map[string][]int32)
}
ue.RatingGroupData[smPolicyID] = append(ue.RatingGroupData[smPolicyID], chgData.RatingGroup)
}

if pccRuleID, ok := influenceDataToPccRule[influenceID]; ok {
// notifying Individual Influence Data update
pccRule := decision.PccRules[pccRuleID]
util.SetSmPolicyDecisionByTrafficInfluData(decision, pccRule, trafficInfluData)
util.SetSmPolicyDecisionByTrafficInfluData(decision, pccRule, trafficInfluData, chgData)
} else {
// notifying Individual Influence Data creation

pccRule := util.CreatePccRule(smPolicy.PccRuleIdGenerator, precedence, nil, trafficInfluData.AfAppId)
util.SetSmPolicyDecisionByTrafficInfluData(decision, pccRule, trafficInfluData)
util.SetSmPolicyDecisionByTrafficInfluData(decision, pccRule, trafficInfluData, chgData)
influenceDataToPccRule[influenceID] = pccRule.PccRuleId
smPolicy.PccRuleIdGenerator++
if precedence < Precedence_Maximum {
Expand Down
57 changes: 56 additions & 1 deletion internal/sbi/processor/smpolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,63 @@ func (p *Processor) HandleCreateSmPolicyRequest(
// UE identity in UDR appData and apply appData to sm poliocy
var precedence int32 = 23
for _, tiData := range trafficInfluDatas {
var chgData *models.ChargingData
var chargingInterface map[string]interface{}

filterCharging := bson.M{
"ueId": ue.Supi,
"snssai": util.SnssaiModelsToHex(*request.SliceInfo),
"dnn": "",
"filter": "",
}
chargingInterface, err = mongoapi.RestfulAPIGetOne(chargingDataColl, filterCharging, queryStrength)
if err != nil {
logger.SmPolicyLog.Errorf("Fail to get charging data to mongoDB err: %+v", err)
chgData = nil
} else if chargingInterface != nil {
rg, err1 := p.Context().RatingGroupIdGenerator.Allocate()
if err1 != nil {
logger.SmPolicyLog.Error("rating group allocate error")
problemDetails := util.GetProblemDetail("rating group allocate error", util.ERROR_IDGENERATOR)
c.JSON(int(problemDetails.Status), problemDetails)
return
}
chgData = &models.ChargingData{
ChgId: util.GetChgId(smPolicyData.ChargingIdGenerator),
RatingGroup: int32(rg),
ReportingLevel: models.ReportingLevel_RAT_GR_LEVEL,
MeteringMethod: models.MeteringMethod_VOLUME,
}

switch chargingInterface["chargingMethod"].(string) {
case "Online":
chgData.Online = true
chgData.Offline = false
case "Offline":
chgData.Online = false
chgData.Offline = true
}

if decision.ChgDecs == nil {
decision.ChgDecs = make(map[string]*models.ChargingData)
}

chargingInterface["ratingGroup"] = chgData.RatingGroup
logger.SmPolicyLog.Tracef("put ratingGroup[%+v] for [%+v] to MongoDB", chgData.RatingGroup, ue.Supi)
if _, err = mongoapi.RestfulAPIPutOne(
chargingDataColl, chargingInterface, chargingInterface, queryStrength); err != nil {
logger.SmPolicyLog.Errorf("Fail to put charging data to mongoDB err: %+v", err)
} else {
smPolicyData.ChargingIdGenerator++
}
if ue.RatingGroupData == nil {
ue.RatingGroupData = make(map[string][]int32)
}
ue.RatingGroupData[smPolicyID] = append(ue.RatingGroupData[smPolicyID], chgData.RatingGroup)
}

pccRule := util.CreatePccRule(smPolicyData.PccRuleIdGenerator, precedence, nil, tiData.AfAppId)
util.SetSmPolicyDecisionByTrafficInfluData(&decision, pccRule, tiData)
util.SetSmPolicyDecisionByTrafficInfluData(&decision, pccRule, tiData, chgData)
influenceID := getInfluenceID(tiData.ResUri)
if influenceID != "" {
smPolicyData.InfluenceDataToPccRule[influenceID] = pccRule.PccRuleId
Expand Down
4 changes: 2 additions & 2 deletions internal/util/pcc_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,13 +229,13 @@ func SetSmPolicyDecisionByDefault(decision *models.SmPolicyDecision, id int32) {

// Set SMpilicy decision with the PCC rule generated from the trafficInfluData
func SetSmPolicyDecisionByTrafficInfluData(decision *models.SmPolicyDecision,
pccRule *models.PccRule, trafficInfluData models.TrafficInfluData,
pccRule *models.PccRule, trafficInfluData models.TrafficInfluData, chgData *models.ChargingData,
) {
tcData := convertToTrafficControlData(&trafficInfluData)
tcData.TcId = strings.ReplaceAll(pccRule.PccRuleId, "PccRuleId", "TcId")
flowInfos := convertToFlowinfos(&trafficInfluData)
pccRule.FlowInfos = flowInfos
SetPccRuleRelatedData(decision, pccRule, tcData, nil, nil, nil)
SetPccRuleRelatedData(decision, pccRule, tcData, nil, chgData, nil)
}

func convertToFlowinfos(trafficInfluData *models.TrafficInfluData) []models.FlowInformation {
Expand Down
Loading