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

fix: get network slice by name and delete operation were broken #248

Merged
merged 1 commit into from
Nov 7, 2024
Merged

fix: get network slice by name and delete operation were broken #248

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
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.1-dev
1.7.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @patriciareinoso, I just noticed this but when you need to create a new release you only need to delete the -dev part of the version. That is the change should be as follows:

- 1.7.1-dev
+ 1.7.1

2 changes: 1 addition & 1 deletion configapi/api_default.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ func GetNetworkSliceByName(c *gin.Context) {
logger.WebUILog.Infoln("Get Network Slice by name")

var networkSlice configmodels.Slice
filter := bson.M{"SliceName": c.Param("slice-name")}
filter := bson.M{"slice-name": c.Param("slice-name")}
rawNetworkSlice, errGetOne := dbadapter.CommonDBClient.RestfulAPIGetOne(sliceDataColl, filter)
if errGetOne != nil {
logger.DbLog.Warnln(errGetOne)
Expand Down
6 changes: 3 additions & 3 deletions proto/server/configEvtHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ func configHandler(configMsgChan chan *configmodels.ConfigMessage, configReceive
if configMsg.Slice == nil {
logger.ConfigLog.Infof("received delete Slice [%v] from config channel", configMsg.SliceName)
config5gMsg.PrevSlice = getSliceByName(configMsg.SliceName)
filter := bson.M{"SliceName": configMsg.SliceName}
filter := bson.M{"slice-name": configMsg.SliceName}
errDelOne := dbadapter.CommonDBClient.RestfulAPIDeleteOne(sliceDataColl, filter)
if errDelOne != nil {
logger.DbLog.Warnln(errDelOne)
Expand Down Expand Up @@ -204,7 +204,7 @@ func handleNetworkSlicePost(configMsg *configmodels.ConfigMessage, subsUpdateCha
config5gMsg.PrevSlice = getSliceByName(configMsg.SliceName)
subsUpdateChan <- &config5gMsg
}
filter := bson.M{"SliceName": configMsg.SliceName}
filter := bson.M{"slice-name": configMsg.SliceName}
sliceDataBsonA := configmodels.ToBsonM(configMsg.Slice)
_, errPost := dbadapter.CommonDBClient.RestfulAPIPost(sliceDataColl, filter, sliceDataBsonA)
if errPost != nil {
Expand Down Expand Up @@ -308,7 +308,7 @@ func getSlices() []*configmodels.Slice {
}

func getSliceByName(name string) *configmodels.Slice {
filter := bson.M{"SliceName": name}
filter := bson.M{"slice-name": name}
sliceDataInterface, errGetOne := dbadapter.CommonDBClient.RestfulAPIGetOne(sliceDataColl, filter)
if errGetOne != nil {
logger.DbLog.Warnln(errGetOne)
Expand Down
4 changes: 2 additions & 2 deletions proto/server/configEvtHandler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ func Test_handleNetworkSlicePost(t *testing.T) {
if postData[0]["coll"] != expected_collection {
t.Errorf("Expected collection %v, got %v", expected_collection, postData[0]["coll"])
}
expected_filter := bson.M{"SliceName": testSlice.SliceName}
expected_filter := bson.M{"slice-name": testSlice.SliceName}
if !reflect.DeepEqual(postData[0]["filter"], expected_filter) {
t.Errorf("Expected filter %v, got %v", expected_filter, postData[0]["filter"])
}
Expand Down Expand Up @@ -313,7 +313,7 @@ func Test_handleNetworkSlicePost_alreadyExists(t *testing.T) {
if postData[0]["coll"] != expected_collection {
t.Errorf("Expected collection %v, got %v", expected_collection, postData[0]["coll"])
}
expected_filter := bson.M{"SliceName": testSlice.SliceName}
expected_filter := bson.M{"slice-name": testSlice.SliceName}
if !reflect.DeepEqual(postData[0]["filter"], expected_filter) {
t.Errorf("Expected filter %v, got %v", expected_filter, postData[0]["filter"])
}
Expand Down