Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: allow empty sd value in snssai #115

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

Merged
merged 1 commit into from
Aug 14, 2024
Merged

fix: allow empty sd value in snssai #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 16 additions & 12 deletions pkg/factory/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func (c *Configuration) validate() (bool, error) {
}

for _, snssaiInfo := range c.SNssaiInfo {
if result, err := snssaiInfo.validate(); err != nil {
if result, err := snssaiInfo.Validate(); err != nil {
return result, err
}
}
Expand Down Expand Up @@ -166,17 +166,19 @@ type SnssaiInfoItem struct {
DnnInfos []*SnssaiDnnInfoItem `yaml:"dnnInfos" valid:"required"`
}

func (s *SnssaiInfoItem) validate() (bool, error) {
func (s *SnssaiInfoItem) Validate() (bool, error) {
if snssai := s.SNssai; snssai != nil {
if result := (snssai.Sst >= 0 && snssai.Sst <= 255); !result {
err := errors.New("Invalid sNssai.Sst: " + strconv.Itoa(int(snssai.Sst)) + ", should be in range 0~255.")
return false, err
}

if result := govalidator.StringMatches(snssai.Sd, "^[0-9A-Fa-f]{6}$"); !result {
err := errors.New("Invalid sNssai.Sd: " + snssai.Sd +
", should be 3 bytes hex string and in range 000000~FFFFFF.")
return false, err
if snssai.Sd != "" {
if result := govalidator.StringMatches(snssai.Sd, "^[0-9A-Fa-f]{6}$"); !result {
err := errors.New("Invalid sNssai.Sd: " + snssai.Sd +
", should be 3 bytes hex string and in range 000000~FFFFFF.")
return false, err
}
}
}

Expand Down Expand Up @@ -489,7 +491,7 @@ func (u *UPNode) validate() (bool, error) {
})

for _, snssaiInfo := range u.SNssaiInfos {
if result, err := snssaiInfo.validate(); err != nil {
if result, err := snssaiInfo.Validate(); err != nil {
return result, err
}
}
Expand Down Expand Up @@ -547,17 +549,19 @@ type SnssaiUpfInfoItem struct {
DnnUpfInfoList []*DnnUpfInfoItem `json:"dnnUpfInfoList" yaml:"dnnUpfInfoList" valid:"required"`
}

func (s *SnssaiUpfInfoItem) validate() (bool, error) {
func (s *SnssaiUpfInfoItem) Validate() (bool, error) {
if s.SNssai != nil {
if result := (s.SNssai.Sst >= 0 && s.SNssai.Sst <= 255); !result {
err := errors.New("Invalid sNssai.Sst: " + strconv.Itoa(int(s.SNssai.Sst)) + ", should be in range 0~255.")
return false, err
}

if result := govalidator.StringMatches(s.SNssai.Sd, "^[0-9A-Fa-f]{6}$"); !result {
err := errors.New("Invalid sNssai.Sd: " + s.SNssai.Sd +
", should be 3 bytes hex string and in range 000000~FFFFFF.")
return false, err
if s.SNssai.Sd != "" {
if result := govalidator.StringMatches(s.SNssai.Sd, "^[0-9A-Fa-f]{6}$"); !result {
err := errors.New("Invalid sNssai.Sd: " + s.SNssai.Sd +
", should be 3 bytes hex string and in range 000000~FFFFFF.")
return false, err
}
}
}

Expand Down
106 changes: 106 additions & 0 deletions pkg/factory/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
package factory_test

import (
"testing"

"github.com/stretchr/testify/require"

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

func TestSnssaiInfoItem(t *testing.T) {
testcase := []struct {
Name string
Snssai *models.Snssai
DnnInfos []*factory.SnssaiDnnInfoItem
}{
{
Name: "Default",
Snssai: &models.Snssai{
Sst: int32(1),
Sd: "010203",
},
DnnInfos: []*factory.SnssaiDnnInfoItem{
{
Dnn: "internet",
DNS: &factory.DNS{
IPv4Addr: "8.8.8.8",
},
},
},
},
{
Name: "Empty SD",
Snssai: &models.Snssai{
Sst: int32(1),
},
DnnInfos: []*factory.SnssaiDnnInfoItem{
{
Dnn: "internet2",
DNS: &factory.DNS{
IPv4Addr: "1.1.1.1",
},
},
},
},
}

for _, tc := range testcase {
t.Run(tc.Name, func(t *testing.T) {
snssaiInfoItem := factory.SnssaiInfoItem{
SNssai: tc.Snssai,
DnnInfos: tc.DnnInfos,
}

ok, err := snssaiInfoItem.Validate()
require.True(t, ok)
require.Nil(t, err)
})
}
}

func TestSnssaiUpfInfoItem(t *testing.T) {
testcase := []struct {
Name string
Snssai *models.Snssai
DnnInfos []*factory.DnnUpfInfoItem
}{
{
Name: "Default",
Snssai: &models.Snssai{
Sst: int32(1),
Sd: "010203",
},
DnnInfos: []*factory.DnnUpfInfoItem{
{
Dnn: "internet",
},
},
},
{
Name: "Empty SD",
Snssai: &models.Snssai{
Sst: int32(1),
},
DnnInfos: []*factory.DnnUpfInfoItem{
{
Dnn: "internet2",
},
},
},
}

for _, tc := range testcase {
t.Run(tc.Name, func(t *testing.T) {
snssaiInfoItem := factory.SnssaiUpfInfoItem{
SNssai: tc.Snssai,
DnnUpfInfoList: tc.DnnInfos,
}

ok, err := snssaiInfoItem.Validate()
require.True(t, ok)
require.Nil(t, err)
})
}
}