Skip to content

Commit

Permalink
Merge branch 'free5gc:main' into feat/r17
Browse files Browse the repository at this point in the history
  • Loading branch information
@pf-lin
pf-lin authored Oct 28, 2024
2 parents 1aabc58 + fdb1309 commit 65832f2
Show file tree
Hide file tree
Showing 23 changed files with 304 additions and 344 deletions.
1 change: 0 additions & 1 deletion .github/workflows/commit-msg-check.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: 'Commit Message Check'

on:
pull_request:
branches: [ main ]

jobs:
build:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/go.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
build:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/golangci-lint.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:
- v*
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
golangci:
Expand Down
2 changes: 1 addition & 1 deletion cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func action(cliCtx *cli.Context) error {
}
factory.UERoutingConfig = ueRoutingCfg

pfcpStart, pfcpTerminate := utils.InitPFCPFunc()
pfcpStart, pfcpTerminate := utils.InitPFCPFunc(ctx)
smf, err := service.NewApp(ctx, cfg, tlsKeyLogPath, pfcpStart, pfcpTerminate)
if err != nil {
sigCh <- nil
Expand Down
4 changes: 2 additions & 2 deletions internal/context/context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ type SMFContext struct {
OAuth2Required bool

UserPlaneInformation *UserPlaneInformation
Ctx context.Context
PFCPCancelFunc context.CancelFunc
PfcpContext context.Context
PfcpCancelFunc context.CancelFunc
PfcpHeartbeatInterval time.Duration

// Now only "IPv4" supported
Expand Down
2 changes: 1 addition & 1 deletion internal/context/datapath.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@ func (p *DataPath) AddChargingRules(smContext *SMContext, chgLevel ChargingLevel
// nolint
nodeId, _ := node.GetUPFID()
logger.PduSessLog.Tracef("DownLinkTunnel add URR for node %s %+v",
nodeId, node.UpLinkTunnel.PDR)
nodeId, node.DownLinkTunnel.PDR)
}
}
}
Expand Down
51 changes: 26 additions & 25 deletions internal/context/sm_context_policy_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package context_test

import (
"context"
"testing"

"github.com/stretchr/testify/require"

"github.com/free5gc/openapi/models"
"github.com/free5gc/smf/internal/context"
smf_context "github.com/free5gc/smf/internal/context"
"github.com/free5gc/smf/pkg/factory"
)

Expand Down Expand Up @@ -110,7 +111,7 @@ var testConfig = factory.Config{
}

func initConfig() {
context.InitSmfContext(&testConfig)
smf_context.InitSmfContext(&testConfig)
factory.SmfConfig = &testConfig
}

Expand All @@ -121,7 +122,7 @@ func TestApplySessionRules(t *testing.T) {
name string
decision *models.SmPolicyDecision
noErr bool
expectedSessRules map[string]*context.SessionRule
expectedSessRules map[string]*smf_context.SessionRule
}{
{
name: "nil decision",
Expand All @@ -147,7 +148,7 @@ func TestApplySessionRules(t *testing.T) {
},
},
},
expectedSessRules: map[string]*context.SessionRule{
expectedSessRules: map[string]*smf_context.SessionRule{
"SessRuleId-1": {
SessionRule: &models.SessionRule{
AuthSessAmbr: &models.Ambr{
Expand Down Expand Up @@ -188,7 +189,7 @@ func TestApplySessionRules(t *testing.T) {
},
},
},
expectedSessRules: map[string]*context.SessionRule{
expectedSessRules: map[string]*smf_context.SessionRule{
"SessRuleId-1": {
SessionRule: &models.SessionRule{
AuthSessAmbr: &models.Ambr{
Expand Down Expand Up @@ -246,7 +247,7 @@ func TestApplySessionRules(t *testing.T) {
},
},
},
expectedSessRules: map[string]*context.SessionRule{
expectedSessRules: map[string]*smf_context.SessionRule{
"SessRuleId-1": {
SessionRule: &models.SessionRule{
AuthSessAmbr: &models.Ambr{
Expand Down Expand Up @@ -291,7 +292,7 @@ func TestApplySessionRules(t *testing.T) {
"SessRuleId-1": nil,
},
},
expectedSessRules: map[string]*context.SessionRule{
expectedSessRules: map[string]*smf_context.SessionRule{
"SessRuleId-2": {
SessionRule: &models.SessionRule{
AuthSessAmbr: &models.Ambr{
Expand Down Expand Up @@ -324,7 +325,7 @@ func TestApplySessionRules(t *testing.T) {
},
}

smctx := context.NewSMContext("imsi-208930000000001", 10)
smctx := smf_context.NewSMContext("imsi-208930000000001", 10)

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
Expand All @@ -346,9 +347,9 @@ func TestApplyPccRules(t *testing.T) {
name string
decision *models.SmPolicyDecision
noErr bool
expectedPCCRules map[string]*context.PCCRule
expectedPCCRules map[string]*smf_context.PCCRule
expectedQosDatas map[string]*models.QosData
expectedTcDatas map[string]*context.TrafficControlData
expectedTcDatas map[string]*smf_context.TrafficControlData
}{
{
name: "nil decision",
Expand Down Expand Up @@ -386,7 +387,7 @@ func TestApplyPccRules(t *testing.T) {
},
},
},
expectedPCCRules: map[string]*context.PCCRule{
expectedPCCRules: map[string]*smf_context.PCCRule{
"PccRuleId-1": {
PccRule: &models.PccRule{
FlowInfos: []models.FlowInformation{
Expand All @@ -406,7 +407,7 @@ func TestApplyPccRules(t *testing.T) {
QosId: "QosId-1",
},
},
expectedTcDatas: map[string]*context.TrafficControlData{
expectedTcDatas: map[string]*smf_context.TrafficControlData{
"TcId-1": {
TrafficControlData: &models.TrafficControlData{
TcId: "TcId-1",
Expand Down Expand Up @@ -442,7 +443,7 @@ func TestApplyPccRules(t *testing.T) {
},
},
},
expectedPCCRules: map[string]*context.PCCRule{
expectedPCCRules: map[string]*smf_context.PCCRule{
"PccRuleId-1": {
PccRule: &models.PccRule{
FlowInfos: []models.FlowInformation{
Expand Down Expand Up @@ -478,7 +479,7 @@ func TestApplyPccRules(t *testing.T) {
QosId: "QosId-2",
},
},
expectedTcDatas: map[string]*context.TrafficControlData{
expectedTcDatas: map[string]*smf_context.TrafficControlData{
"TcId-1": {
TrafficControlData: &models.TrafficControlData{
TcId: "TcId-1",
Expand Down Expand Up @@ -514,7 +515,7 @@ func TestApplyPccRules(t *testing.T) {
},
},
},
expectedPCCRules: map[string]*context.PCCRule{
expectedPCCRules: map[string]*smf_context.PCCRule{
"PccRuleId-1": {
PccRule: &models.PccRule{
FlowInfos: []models.FlowInformation{
Expand Down Expand Up @@ -550,7 +551,7 @@ func TestApplyPccRules(t *testing.T) {
QosId: "QosId-3",
},
},
expectedTcDatas: map[string]*context.TrafficControlData{
expectedTcDatas: map[string]*smf_context.TrafficControlData{
"TcId-1": {
TrafficControlData: &models.TrafficControlData{
TcId: "TcId-1",
Expand All @@ -571,7 +572,7 @@ func TestApplyPccRules(t *testing.T) {
"PccRuleId-2": nil,
},
},
expectedPCCRules: map[string]*context.PCCRule{
expectedPCCRules: map[string]*smf_context.PCCRule{
"PccRuleId-1": {
PccRule: &models.PccRule{
FlowInfos: []models.FlowInformation{
Expand All @@ -591,7 +592,7 @@ func TestApplyPccRules(t *testing.T) {
QosId: "QosId-3",
},
},
expectedTcDatas: map[string]*context.TrafficControlData{
expectedTcDatas: map[string]*smf_context.TrafficControlData{
"TcId-1": {
TrafficControlData: &models.TrafficControlData{
TcId: "TcId-1",
Expand All @@ -612,20 +613,20 @@ func TestApplyPccRules(t *testing.T) {
"PccRuleId-1": nil,
},
},
expectedPCCRules: map[string]*context.PCCRule{},
expectedPCCRules: map[string]*smf_context.PCCRule{},
expectedQosDatas: map[string]*models.QosData{},
expectedTcDatas: map[string]*context.TrafficControlData{},
expectedTcDatas: map[string]*smf_context.TrafficControlData{},
noErr: true,
},
}

smfContext := context.GetSelf()
smfContext.UserPlaneInformation = context.NewUserPlaneInformation(&userPlaneConfig)
smfContext := smf_context.GetSelf()
smfContext.UserPlaneInformation = smf_context.NewUserPlaneInformation(&userPlaneConfig)
for _, n := range smfContext.UserPlaneInformation.UPFs {
n.UPF.UPFStatus = context.AssociatedSetUpSuccess
n.UPF.AssociationContext = context.Background()
}

smctx := context.NewSMContext("imsi-208930000000002", 10)
smctx := smf_context.NewSMContext("imsi-208930000000002", 10)

smctx.SMLock.Lock()
defer smctx.SMLock.Unlock()
Expand Down Expand Up @@ -655,7 +656,7 @@ func TestApplyPccRules(t *testing.T) {
},
}
smctx.SelectedPDUSessionType = 1
smctx.SessionRules["SessRuleId-1"] = &context.SessionRule{
smctx.SessionRules["SessRuleId-1"] = &smf_context.SessionRule{
SessionRule: &models.SessionRule{
AuthSessAmbr: &models.Ambr{
Uplink: "1000 Kbps",
Expand Down
Loading

0 comments on commit 65832f2

Please sign in to comment.