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

Jump to bottom

[SDFAB-1110] Add support for multiple application filters #60

Merged
merged 22 commits into from
Mar 28, 2022
Merged

[SDFAB-1110] Add support for multiple application filters #60

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2e7ebb5
First commit
Mar 21, 2022
979f4cc
Refactor
Mar 22, 2022
8990edf
Generate new FARs and Application QERs for each app filter flag
Mar 23, 2022
f6dc2a7
Refactor
Mar 23, 2022
f306eab
Refactor
Mar 23, 2022
9d94720
Refactor
Mar 23, 2022
75af06d
Refactor
Mar 23, 2022
8f9f408
Remove debug code
Mar 23, 2022
10cd759
Fix incorrect handling of IDs
Mar 23, 2022
4f4c13d
Fix default protocol
Mar 23, 2022
aeeedc2
Refactor comment
Mar 23, 2022
d4d0e96
Sync changes when modifying sessions
Mar 23, 2022
00053c0
Use app filters also when modifying sessions to generate the correct IDs
Mar 23, 2022
e1fd009
Fix missing app filters when modifying sessions
Mar 24, 2022
2797c7e
Refactor
Mar 24, 2022
479fa05
Add precedence in app filter format
Mar 24, 2022
2da62e6
Remove debug code
Mar 24, 2022
3674e85
Add test cases for app filter parser
Mar 24, 2022
f4c6573
Fix format in app filter flag
Mar 24, 2022
0020715
Add check on baseID
Mar 24, 2022
a50bb9d
Add validation step
Mar 24, 2022
b867dda
Remove debug code
Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
148 changes: 79 additions & 69 deletions api/pfcpsim.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion api/pfcpsim.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ message CreateSessionRequest {
int32 baseID = 2;
string nodeBAddress = 3;
string ueAddressPool = 4;
string appFilter = 5;
repeated string appFilters = 5;
int32 qfi = 6; // Should be uint8
}

Expand All @@ -26,6 +26,7 @@ message ModifySessionRequest {
string ueAddressPool = 4;
bool bufferFlag = 5;
bool notifyCPFlag = 6;
repeated string appFilters = 7;
}

message ConfigureRequest {
Expand Down
4 changes: 4 additions & 0 deletions internal/pfcpctl/commands/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ func connect() pb.PFCPSimClient {
return pb.NewPFCPSimClient(conn)
}

func validateArgs(args *commonArgs) {

}

func disconnect() {
if conn != nil {
conn.Close()
Expand Down
34 changes: 25 additions & 9 deletions internal/pfcpctl/commands/sessions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,22 @@ import (
)

type commonArgs struct {
Count int `short:"c" long:"count" default:"1" description:"The number of sessions to create"`
BaseID int `short:"i" long:"baseID" default:"1" description:"The base ID to use"`
UePool string `short:"u" long:"ue-pool" default:"17.0.0.0/24" description:"The UE pool address"`
GnBAddress string `short:"g" long:"gnb-addr" description:"The UE pool address"`
AppFilterString string `short:"a" long:"app-filter" description:"Specify an application filter. Format: '{ip | udp | tcp}:{IPv4 Prefix | any}:{<lower-L4-port>-<upper-L4-port> | any}:{allow | deny}' . e.g. 'udp:10.0.0.0/8:80-88:allow'"`
QFI uint8 `short:"q" long:"qfi" description:"The QFI value for QERs. Max value 64."`
Count int `short:"c" long:"count" default:"1" description:"The number of sessions to create"`
BaseID int `short:"i" long:"baseID" default:"1" description:"The base ID to use"`
UePool string `short:"u" long:"ue-pool" default:"17.0.0.0/24" description:"The UE pool address"`
GnBAddress string `short:"g" long:"gnb-addr" description:"The UE pool address"`
AppFilterString []string `short:"a" long:"app-filter" default:"ip:any:any:allow:100" description:"Specify an application filter. Format: '{ip | udp | tcp}:{IPv4 Prefix | any}:{<lower-L4-port>-<upper-L4-port> | any}:{allow | deny}:{rule-precedence}' . e.g. 'udp:10.0.0.0/8:80-88:allow:100'"`
QFI uint8 `short:"q" long:"qfi" description:"The QFI value for QERs. Max value 64."`
}

func (a *commonArgs) validate() {
if a.BaseID <= 0 {
log.Fatalf("BaseID cannot be 0 or a negative number.")
}

if a.Count <= 0 {
log.Fatalf("Count cannot be 0 or a negative number.")
}
}

type sessionCreate struct {
Expand All @@ -36,8 +46,7 @@ type sessionModify struct {

type sessionDelete struct {
Args struct {
Count int `short:"c" long:"count" default:"1" description:"The number of sessions to create"`
BaseID int `short:"i" long:"baseID" default:"1" description:"The base ID to use"`
commonArgs
}
}

Expand All @@ -59,12 +68,14 @@ func (s *sessionCreate) Execute(args []string) error {
client := connect()
defer disconnect()

s.Args.validate()

res, err := client.CreateSession(context.Background(), &pb.CreateSessionRequest{
Count: int32(s.Args.Count),
BaseID: int32(s.Args.BaseID),
NodeBAddress: s.Args.GnBAddress,
UeAddressPool: s.Args.UePool,
AppFilter: s.Args.AppFilterString,
AppFilters: s.Args.AppFilterString,
Qfi: int32(s.Args.QFI),
})

Expand All @@ -81,13 +92,16 @@ func (s *sessionModify) Execute(args []string) error {
client := connect()
defer disconnect()

s.Args.validate()

res, err := client.ModifySession(context.Background(), &pb.ModifySessionRequest{
Count: int32(s.Args.Count),
BaseID: int32(s.Args.BaseID),
NodeBAddress: s.Args.GnBAddress,
UeAddressPool: s.Args.UePool,
BufferFlag: s.Args.BufferFlag,
NotifyCPFlag: s.Args.NotifyCPFlag,
AppFilters: s.Args.AppFilterString,
})

if err != nil {
Expand All @@ -103,6 +117,8 @@ func (s *sessionDelete) Execute(args []string) error {
client := connect()
defer disconnect()

s.Args.validate()

res, err := client.DeleteSession(context.Background(), &pb.DeleteSessionRequest{
Count: int32(s.Args.Count),
BaseID: int32(s.Args.BaseID),
Expand Down