Revert "Snssai.Sd values to lower case (#13)"

This reverts commit a0a3860.
free5gc · Aug 6, 2023 · 7cad3ac · 7cad3ac
1 parent a0a3860
commit 7cad3ac
Showing 1 changed file with 3 additions and 42 deletions.
diff --git a/internal/sbi/producer/data_repository.go b/internal/sbi/producer/data_repository.go
@@ -627,8 +627,6 @@ func ApplicationDataInfluenceDataInfluenceIdPatchProcedure(
 		return nil, http.StatusNotFound
 	}
 
-	request.Snssai.Sd = strings.ToLower(request.Snssai.Sd)
-
 	patchTrafficInfluData := models.TrafficInfluData{
 		UpPathChgNotifCorreId: request.UpPathChgNotifCorreId,
 		AppReloInd:            request.AppReloInd,
@@ -705,7 +703,6 @@ func ApplicationDataInfluenceDataInfluenceIdPutProcedure(
 	collName, influenceId string, request *models.TrafficInfluData) (
 	*models.TrafficInfluData, *models.ProblemDetails, int,
 ) {
-	request.Snssai.Sd = strings.ToLower(request.Snssai.Sd)
 	putData := util.ToBsonM(*request)
 	putData["influenceId"] = influenceId
 	filter := bson.M{"influenceId": influenceId}
@@ -1421,7 +1418,6 @@ func HandlePolicyDataUesUeIdSmDataGet(request *httpwrapper.Request) *httpwrapper
 	if err != nil {
 		logger.DataRepoLog.Warnln(err)
 	}
-	sNssai.Sd = strings.ToLower(sNssai.Sd)
 	dnn := request.Query.Get("dnn")
 
 	response, problemDetails := PolicyDataUesUeIdSmDataGetProcedure(collName, ueId, sNssai, dnn)
@@ -1439,7 +1435,7 @@ func PolicyDataUesUeIdSmDataGetProcedure(collName string, ueId string, snssai mo
 	dnn string,
 ) (*models.SmPolicyData, *models.ProblemDetails) {
 	filter := bson.M{"ueId": ueId}
-	snssai.Sd = strings.ToLower(snssai.Sd)
+
 	if !reflect.DeepEqual(snssai, models.Snssai{}) {
 		filter["smPolicySnssaiData."+util.SnssaiModelsToHex(snssai)] = bson.M{"$exists": true}
 	}
@@ -1459,17 +1455,14 @@ func PolicyDataUesUeIdSmDataGetProcedure(collName string, ueId string, snssai mo
 		logger.DataRepoLog.Warnln(err)
 	}
 	tmpSmPolicySnssaiData := make(map[string]models.SmPolicySnssaiData)
-	for sstSd, snssaiData := range smPolicyDataResp.SmPolicySnssaiData {
-		sstSd = strings.ToLower(sstSd)
-		snssaiData.Snssai.Sd = strings.ToLower(snssaiData.Snssai.Sd)
-
+	for snssai, snssaiData := range smPolicyDataResp.SmPolicySnssaiData {
 		tmpSmPolicyDnnData := make(map[string]models.SmPolicyDnnData)
 		for escapedDnn, dnnData := range snssaiData.SmPolicyDnnData {
 			dnn := util.UnescapeDnn(escapedDnn)
 			tmpSmPolicyDnnData[dnn] = dnnData
 		}
 		snssaiData.SmPolicyDnnData = tmpSmPolicyDnnData
-		tmpSmPolicySnssaiData[sstSd] = snssaiData
+		tmpSmPolicySnssaiData[snssai] = snssaiData
 	}
 	smPolicyDataResp.SmPolicySnssaiData = tmpSmPolicySnssaiData
 	filter = bson.M{"ueId": ueId}
@@ -1488,7 +1481,6 @@ func PolicyDataUesUeIdSmDataGetProcedure(collName string, ueId string, snssai mo
 			smPolicyDataResp.UmData[element.LimitId] = element
 		}
 	}
-
 	return &smPolicyDataResp, nil
 }
 
@@ -1516,9 +1508,6 @@ func PolicyDataUesUeIdSmDataPatchProcedure(collName string, ueId string,
 	for k, usageMonData := range UsageMonData {
 		limitId := k
 		filterTmp := bson.M{"ueId": ueId, "limitId": limitId}
-		for i := range usageMonData.Scopes {
-			usageMonData.Scopes[i].Snssai.Sd = strings.ToLower(usageMonData.Scopes[i].Snssai.Sd)
-		}
 		if err := mongoapi.RestfulAPIMergePatch(collName, filterTmp, util.ToBsonM(usageMonData)); err != nil {
 			successAll = false
 		} else {
@@ -1531,11 +1520,6 @@ func PolicyDataUesUeIdSmDataPatchProcedure(collName string, ueId string,
 			if err := json.Unmarshal(util.MapToByte(usageMonDataBsonM), &usageMonData); err != nil {
 				logger.DataRepoLog.Warnln(err)
 			}
-
-			for i, scope := range usageMonData.Scopes {
-				usageMonData.Scopes[i].Snssai.Sd = strings.ToLower(scope.Snssai.Sd)
-			}
-
 			PreHandlePolicyDataChangeNotification(ueId, limitId, usageMonData)
 		}
 	}
@@ -1551,15 +1535,6 @@ func PolicyDataUesUeIdSmDataPatchProcedure(collName string, ueId string,
 			logger.DataRepoLog.Warnln(err)
 		}
 
-		newSmPolicySnssaiData := make(map[string]models.SmPolicySnssaiData)
-		for sstSd, snssaiData := range smPolicyData.SmPolicySnssaiData {
-			sstSd = strings.ToLower(sstSd)
-			snssaiData.Snssai.Sd = strings.ToLower(snssaiData.Snssai.Sd)
-			newSmPolicySnssaiData[sstSd] = snssaiData
-		}
-
-		smPolicyData.SmPolicySnssaiData = newSmPolicySnssaiData
-
 		collName := "policyData.ues.smData.usageMonData"
 		filter := bson.M{"ueId": ueId}
 		usageMonDataMapArray, err := mongoapi.RestfulAPIGetMany(collName, filter)
@@ -1577,7 +1552,6 @@ func PolicyDataUesUeIdSmDataPatchProcedure(collName string, ueId string,
 				smPolicyData.UmData[element.LimitId] = element
 			}
 		}
-
 		PreHandlePolicyDataChangeNotification(ueId, "", smPolicyData)
 		return nil
 	}
@@ -1634,9 +1608,6 @@ func HandlePolicyDataUesUeIdSmDataUsageMonIdPut(request *httpwrapper.Request) *h
 	ueId := request.Params["ueId"]
 	usageMonId := request.Params["usageMonId"]
 	usageMonData := request.Body.(models.UsageMonData)
-	for i, scope := range usageMonData.Scopes {
-		usageMonData.Scopes[i].Snssai.Sd = strings.ToLower(scope.Snssai.Sd)
-	}
 	collName := "policyData.ues.smData.usageMonData"
 
 	response := PolicyDataUesUeIdSmDataUsageMonIdPutProcedure(collName, ueId, usageMonId, usageMonData)
@@ -1647,10 +1618,6 @@ func HandlePolicyDataUesUeIdSmDataUsageMonIdPut(request *httpwrapper.Request) *h
 func PolicyDataUesUeIdSmDataUsageMonIdPutProcedure(collName string, ueId string, usageMonId string,
 	usageMonData models.UsageMonData,
 ) *bson.M {
-	for i, scope := range usageMonData.Scopes {
-		usageMonData.Scopes[i].Snssai.Sd = strings.ToLower(scope.Snssai.Sd)
-	}
-
 	putData := util.ToBsonM(usageMonData)
 	putData["ueId"] = ueId
 	putData["usageMonId"] = usageMonId
@@ -2448,7 +2415,6 @@ func QueryProvisionedDataProcedure(ueId string, servingPlmnId string,
 			return nil, openapi.ProblemDetailsSystemFailure(err.Error())
 		}
 		for _, smData := range tmp {
-			smData.SingleNssai.Sd = strings.ToLower(smData.SingleNssai.Sd)
 			dnnConfigurations := smData.DnnConfigurations
 			tmpDnnConfigurations := make(map[string]models.DnnConfiguration)
 			for escapedDnn, dnnConf := range dnnConfigurations {
@@ -2785,8 +2751,6 @@ func HandleQuerySmData(request *httpwrapper.Request) *httpwrapper.Response {
 		logger.DataRepoLog.Warnln(err)
 	}
 
-	singleNssai.Sd = strings.ToLower(singleNssai.Sd)
-
 	dnn := request.Query.Get("dnn")
 	response := QuerySmDataProcedure(collName, ueId, servingPlmnId, singleNssai, dnn)
 
@@ -2796,7 +2760,6 @@ func HandleQuerySmData(request *httpwrapper.Request) *httpwrapper.Response {
 func QuerySmDataProcedure(collName string, ueId string, servingPlmnId string,
 	singleNssai models.Snssai, dnn string,
 ) *[]map[string]interface{} {
-	singleNssai.Sd = strings.ToLower(singleNssai.Sd)
 	filter := bson.M{"ueId": ueId, "servingPlmnId": servingPlmnId}
 
 	if !reflect.DeepEqual(singleNssai, models.Snssai{}) {
@@ -2825,7 +2788,6 @@ func QuerySmDataProcedure(collName string, ueId string, servingPlmnId string,
 			logger.DataRepoLog.Debug("SmData Unmarshal error")
 			continue
 		}
-		tmpSmData.SingleNssai.Sd = strings.ToLower(tmpSmData.SingleNssai.Sd)
 		dnnConfigurations := tmpSmData.DnnConfigurations
 		tmpDnnConfigurations := make(map[string]models.DnnConfiguration)
 		for escapedDnn, dnnConf := range dnnConfigurations {
@@ -2863,7 +2825,6 @@ func HandleCreateSmfContextNon3gpp(request *httpwrapper.Request) *httpwrapper.Re
 func CreateSmfContextNon3gppProcedure(SmfRegistration models.SmfRegistration,
 	collName string, ueId string, pduSessionIdInt int64,
 ) (bson.M, int) {
-	SmfRegistration.SingleNssai.Sd = strings.ToLower(SmfRegistration.SingleNssai.Sd)
 	putData := util.ToBsonM(SmfRegistration)
 	putData["ueId"] = ueId
 	putData["pduSessionId"] = int32(pduSessionIdInt)