OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: radioid contain radio type+radio ID like '4G_3" or "5G_6"

Browse Source
This commit is contained in:
simonzhangsz
2024-07-10 11:44:50 +08:00
parent 2207ce80f0
commit 79ada207bd
1 changed files with 50 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
features/ue/ue.go
View File

@@ -653,6 +653,7 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
services.ResponseNotFound404UriNotExist(w, r) services.ResponseNotFound404UriNotExist(w, r)
return return
} }
//neTypeLower := strings.ToLower(neType) //neTypeLower := strings.ToLower(neType)
var neId string var neId string
neIds := services.GetParamsArrByName("neId", r) neIds := services.GetParamsArrByName("neId", r)
@@ -691,8 +692,7 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
requestURI2NF := fmt.Sprintf("%s%s", hostUri, r.RequestURI) requestURI2NF := fmt.Sprintf("%s%s", hostUri, r.RequestURI)
// for apifox mock test // for apifox mock test
// hostUri := "http://127.0.0.1:4523" //requestURI2NF := "http://127.0.0.1:4523/m1/3157310-1528434-default/api/rest/ueManagement/v1/elementType/" + strings.ToLower(neType) + "/objectType/nbInfo?apifoxApiId=128848301"
// requestURI2NF := hostUri + "/m1/3157310-1528434-default/api/rest/ueManagement/v1/elementType/amf/objectType/nbInfo?apifoxApiId=128848301"
log.Debug("requestURI2NF:", requestURI2NF) log.Debug("requestURI2NF:", requestURI2NF)
@@ -707,9 +707,15 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
log.Error("Get system state from NF is failed:", err) log.Error("Get system state from NF is failed:", err)
services.ResponseInternalServerError500ProcessError(w, err) services.ResponseInternalServerError500ProcessError(w, err)
return return
} else { }
// multi-tenancy solution // multi-tenancy solution
var tenantID, where, userName string var tenantID, where, userName, radioType string
if strings.ToLower(neType) == "mme" {
radioType = "4G"
} else if strings.ToLower(neType) == "amf" {
radioType = "5G"
}
if tenantName != "" { if tenantName != "" {
where = fmt.Sprintf("status='1' and tenant_name='%s'", tenantName) where = fmt.Sprintf("status='1' and tenant_name='%s'", tenantName)
tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_id", where) tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_id", where)
@@ -725,8 +731,9 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
var response NBInfoResponse var response NBInfoResponse
//var nbInfo *TenantNBInfo //var nbInfo *TenantNBInfo
_ = json.Unmarshal(resp.Body(), &response) _ = json.Unmarshal(resp.Body(), &response)
for i := 0; i < len(response.Data); i++ { for i := 0; i < len(response.Data); i++ {
where = fmt.Sprintf("status='1' and tenancy_type='RADIO' and tenancy_key='%v'", response.Data[i].ID) where = fmt.Sprintf("status='1' and tenancy_type='RADIO' and tenancy_key='%v'", radioType+"_"+response.Data[i].ID)
tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "parent_id", where) tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "parent_id", where)
where = fmt.Sprintf("status='1' and tenant_id='%s'", tenantID) where = fmt.Sprintf("status='1' and tenant_id='%s'", tenantID)
tenantName, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_name", where) tenantName, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_name", where)
@@ -734,6 +741,7 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
response.Data[i].TenantName = tenantName response.Data[i].TenantName = tenantName
} }
services.ResponseWithJson(w, resp.StatusCode(), &response) services.ResponseWithJson(w, resp.StatusCode(), &response)
return
} else { } else {
// var response services.MapResponse // var response services.MapResponse
var tenantNBInfos []TenantNBInfo var tenantNBInfos []TenantNBInfo
@@ -744,7 +752,7 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
dborm.XormFindColStringArrayByWhere("sys_tenant", "tenancy_key", where, &nbIDs) dborm.XormFindColStringArrayByWhere("sys_tenant", "tenancy_key", where, &nbIDs)
_ = json.Unmarshal(resp.Body(), &nbInfos) _ = json.Unmarshal(resp.Body(), &nbInfos)
for _, n := range nbInfos.Data { for _, n := range nbInfos.Data {
if global.IsMember(n.ID, nbIDs) { if global.IsMember(radioType+"_"+n.ID, nbIDs) {
n.TenantName = tenantName n.TenantName = tenantName
tenantNBInfos = append(tenantNBInfos, n) tenantNBInfos = append(tenantNBInfos, n)
} }
@@ -755,7 +763,6 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
return return
} }
} }
}
// Get Radio Info from NF/NFs // Get Radio Info from NF/NFs
func GetNBInfoAllFromNF(w http.ResponseWriter, r *http.Request) { func GetNBInfoAllFromNF(w http.ResponseWriter, r *http.Request) {