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

Jump to bottom

support converged charging #76

Closed

Roy-Hu wants to merge 32 commits into free5gc:main from Roy-Hu:PR

Roy-Hu commented May 15, 2023

PDU-based Charging: SMF collects charging information related to data volumes sent to and received by the
UE per user per PDU session (achieved by flow-based charging with a specific rating group)
Flow-Based Charging: SMF categorizes the service data flows within PDU session data traffic by rating group and/or
combination of the rating group
The PCC will define the flow's charging method(online/offline) and its rating group. Set the charging of default PCC (FlowDescription: "permit out ip from any to assigned" )to PDU-based Charging. All the data paths created for pcc need to additionally apply the URR created for this default pcc for recording all volumes in a PDU session.

tim-ywliu force-pushed the PR branch from 5990aa5 to 2a5fd65 Compare

August 11, 2023 08:17

Collaborator

tim-ywliu commented Aug 11, 2023

@Roy-Hu @Tai-shang-chun
I rebased this PR and updated openapi/pfcp hash to the latest, but it will go test fail.
Please help fix it. Thanks.

ianchen0119 reviewed

View reviewed changes

internal/context/datapath.go

+              					if newURR, err := node.UPF.AddURR(uint32(urrId),
+              						NewMeasureInformation(false, false),
+              						SetStartofSDFTrigger()); err != nil {
+              						logger.PduSessLog.Errorln("new URR failed")

Contributor

ianchen0119 Aug 14, 2023

SelectDefaultDataPath() shold free allocated URR ID before function returned.

internal/context/datapath.go

+              					if newURR, err := node.UPF.AddURR(uint32(urrId),
+              						NewMeasureInformation(false, false),
+              						NewVolumeThreshold(smContext.UrrReportThreshold)); err != nil {
+              						logger.PduSessLog.Errorln("new URR failed")

Contributor

ianchen0119 Aug 14, 2023

SelectDefaultDataPath() shold free allocated URR ID before function returned.

internal/context/pcc_rule.go Outdated Show resolved Hide resolved

internal/context/sm_context.go Outdated Show resolved Hide resolved

internal/context/sm_context.go Outdated Show resolved Hide resolved

internal/context/sm_context_policy.go Outdated Show resolved Hide resolved

internal/context/sm_context_policy.go Outdated Show resolved Hide resolved

ianchen0119 reviewed

View reviewed changes

internal/sbi/producer/callback.go Outdated Show resolved Hide resolved

ianchen0119 reviewed

View reviewed changes

internal/sbi/producer/charging_trigger.go Show resolved Hide resolved

ianchen0119 reviewed

View reviewed changes

internal/sbi/producer/charging_trigger.go Outdated Show resolved Hide resolved

ianchen0119 reviewed

View reviewed changes

internal/sbi/producer/charging_trigger.go Outdated Show resolved Hide resolved

ianchen0119 reviewed

View reviewed changes

internal/sbi/producer/charging_trigger.go Outdated Show resolved Hide resolved

ianchen0119 reviewed

View reviewed changes

internal/pfcp/handler/handler.go Outdated Show resolved Hide resolved

ianchen0119 reviewed

View reviewed changes

internal/pfcp/message/build.go Show resolved Hide resolved

ianchen0119 reviewed

View reviewed changes

internal/sbi/producer/callback.go Outdated Show resolved Hide resolved

ianchen0119 reviewed

View reviewed changes

internal/sbi/producer/pdu_session.go Outdated Show resolved Hide resolved

ianchen0119 reviewed

View reviewed changes

internal/sbi/producer/pdu_session.go Outdated Show resolved Hide resolved

ianchen0119 force-pushed the PR branch 2 times, most recently from 40fa8c1 to b4a1941 Compare

September 6, 2023 07:44

brianchennn reviewed

View reviewed changes

internal/context/datapath.go Outdated

+              			if node.UpLinkTunnel != nil && node.UpLinkTunnel.PDR != nil {
+              				urrs = node.UpLinkTunnel.PDR.URR
+              			} else if node.DownLinkTunnel != nil && node.DownLinkTunnel.PDR != nil {
+              				urrs = node.UpLinkTunnel.PDR.URR

Contributor

brianchennn Sep 12, 2023

urrs = node.DownLinkTunnel.PDR.URR

internal/context/pcc_rule.go Outdated

+              	if dlIPFilterRule.Src == "any" && dlIPFilterRule.Dst == "assigned" {
+              		return PduSessionCharging, nil
+              	} else {
+              		// For pcc that have applicable for all datapath fpr a datapath, it's charging level will be flow based

Contributor

brianchennn Sep 12, 2023

typo?

internal/context/pfcp_reports.go Outdated

+              )
+              func (smContext *SMContext) HandleReports(
+              	UsageReportReport []*pfcp.UsageReportPFCPSessionReportRequest,

Contributor

brianchennn Sep 12, 2023

Should rename to UsageReportRequest ?

brianchennn mentioned this pull request

[Bugs] Add CHF NF submodule free5gc/free5gc#480

Closed

roy19991013 and others added 13 commits

October 3, 2023 09:07


          support converged charging

aa50e9d


          flow status

8908ad5


          add pdu level charging urr to default data path

fbf1c63


          fix: only onlince charging need to request unit

d236f2b


          fix: release charging session in all pdu session release case

4b3a277


          fix: don't send charging request for non-charging urr

29b6f39


          rm untested code

c56f0f8


          update openapi/pfcp hash

a274890


          add nil & error checking

5831ddc


          update go.sum

9ed1ebf


          add more error checking

33fc34d


          fix test fail

79b83f3


          fix ci error

0ec5749

ianchen0119 and others added 4 commits

October 3, 2023 09:09


          add comment for addPduLevelChargingRuleToFlow()

f67ffe7


          add comment & fix potential synchronization issues

467694c


          fix typo & linter error

eb77066


          handle assigned when IP in ipFilterRule is assigned

c373a13

brianchennn force-pushed the PR branch from 97a6981 to c373a13 Compare

October 10, 2023 05:43

brianchennn and others added 5 commits

October 13, 2023 08:59


          fix typo

62c70bc


          fix typo & set default value of RequestedUnit

51bbb87


          fix NewSMContext

53f3d62


          fix: remove SwapSrcAndDst()

96d8b7d


          fix: UL, DL flow description should be same

fe96cf2

brianchennn force-pushed the PR branch 3 times, most recently from 22bba06 to b91e5e4 Compare

November 24, 2023 08:24

brianchennn added 3 commits

November 24, 2023 08:28


          remove SMF's default data path to reduce redundant PDRs

e6d08d2


          fix: testcase's ip.dst should not be any

89bfa61


          style: fix naked return

0cdbfa6

brianchennn force-pushed the PR branch from 3c920c4 to 0cdbfa6 Compare

November 24, 2023 08:28

brianchennn mentioned this pull request

Add CHF for testing free5gc/free5gc#507

Closed


          update util's hash

05b05de

brianchennn force-pushed the PR branch from bc43465 to c7ca2c0 Compare

November 28, 2023 05:37


          fix: duplicated URRs in PDR

4788fdf

brianchennn force-pushed the PR branch from c7ca2c0 to 4788fdf Compare

November 28, 2023 06:57

brianchennn added 3 commits

December 1, 2023 05:53


          fix: Volume Threshold IE should be added to PFCP Session Modification…

… Request Update URR to prevent the flow rule be blocked


          remove SMContext.UrrIDGenerator

a9f0c3a


          fix: MBQE, MAQE's URR

55743da

brianchennn force-pushed the PR branch from 691d252 to 55743da Compare

December 7, 2023 08:20

brianchennn added 2 commits

December 7, 2023 09:07


          comment out these variable: N3N6, N3N9, N9N6

ce7b0ce


          remove FlowDescription judgement

c8f767d

andy89923 mentioned this pull request

Feature: Support Converged Charging #94

Merged

ianchen0119 closed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet