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

Signed-off-by: Patricia Reinoso <[email protected]>
omec-project · Nov 7, 2024 · 43ab52d · 43ab52d
1 parent 1ef5845
commit 43ab52d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.7.1-dev
+1.7.2
diff --git a/configapi/api_default.go b/configapi/api_default.go
@@ -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)

diff --git a/proto/server/configEvtHandler.go b/proto/server/configEvtHandler.go
@@ -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)
@@ -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 {
@@ -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)

diff --git a/proto/server/configEvtHandler_test.go b/proto/server/configEvtHandler_test.go
@@ -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"])
 		}
@@ -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"])
 		}