Merge remote-tracking branch 'origin/main' into multi-tenant
This commit is contained in:
@@ -8,13 +8,14 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"be.ems/lib/core/utils/ctx"
|
||||
"be.ems/lib/core/ctx"
|
||||
"be.ems/lib/dborm"
|
||||
"be.ems/lib/global"
|
||||
"be.ems/lib/log"
|
||||
"be.ems/lib/services"
|
||||
"be.ems/restagent/config"
|
||||
tokenConst "be.ems/src/framework/constants/token"
|
||||
neService "be.ems/src/modules/network_element/service"
|
||||
"github.com/go-resty/resty/v2"
|
||||
"github.com/gorilla/mux"
|
||||
)
|
||||
@@ -261,20 +262,12 @@ type UEInfoResponse struct {
|
||||
|
||||
// Get UEInfo from NF/NFs, SMF Online users
|
||||
func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
|
||||
log.Info("GetUEInfoFromNF processing... ")
|
||||
log.Debug("GetUEInfoFromNF processing... ")
|
||||
|
||||
vars := mux.Vars(r)
|
||||
neType := vars["elementTypeValue"]
|
||||
if neType == "" {
|
||||
services.ResponseNotFound404UriNotExist(w, r)
|
||||
return
|
||||
}
|
||||
//neTypeLower := strings.ToLower(neType)
|
||||
var neId string
|
||||
neIds := services.GetParamsArrByName("neId", r)
|
||||
if len(neIds) == 1 {
|
||||
neId = neIds[0]
|
||||
} else {
|
||||
neId := ctx.GetQuery(r, "neId")
|
||||
neType := ctx.GetParam(r, "elementTypeValue")
|
||||
if neType == "" || neId == "" {
|
||||
log.Error("elementTypeValue/neId is empty")
|
||||
services.ResponseNotFound404UriNotExist(w, r)
|
||||
return
|
||||
}
|
||||
@@ -283,93 +276,74 @@ func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
|
||||
if len(tenantNames) > 0 {
|
||||
tenantName = tenantNames[0]
|
||||
}
|
||||
// token, err := services.CheckFrontValidRequest(w, r)
|
||||
// if err != nil {
|
||||
// log.Error("Request error:", err)
|
||||
// return
|
||||
// }
|
||||
// log.Debug("token:", token)
|
||||
|
||||
neInfo, err := dborm.XormGetNeInfo(neType, neId)
|
||||
if err != nil {
|
||||
log.Error("Failed to XormGetNeInfo:", err)
|
||||
services.ResponseInternalServerError500ProcessError(w, err)
|
||||
return
|
||||
} else if neInfo == nil {
|
||||
err := global.ErrCMNotFoundTargetNE
|
||||
log.Error(global.ErrCMNotFoundTargetNE)
|
||||
services.ResponseInternalServerError500ProcessError(w, err)
|
||||
return
|
||||
}
|
||||
log.Trace("neInfo:", neInfo)
|
||||
neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
|
||||
|
||||
hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port)
|
||||
requestURI2NF := fmt.Sprintf("%s%s", hostUri, r.RequestURI)
|
||||
// for apifox mock test
|
||||
// hostUri := "http://127.0.0.1:4523"
|
||||
// requestURI2NF := hostUri + "/m1/3157310-1528434-default/api/rest/ueManagement/v1/elementType/smf/objectType/ueInfo?apifoxApiId=128609449"
|
||||
|
||||
log.Debug("requestURI2NF:", requestURI2NF)
|
||||
|
||||
resp, err := client.R().
|
||||
EnableTrace().
|
||||
SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
|
||||
// SetHeaders(map[string]string{"accessToken": token}).
|
||||
SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
|
||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||
Get(requestURI2NF)
|
||||
if err != nil {
|
||||
log.Error("Get system state from NF is failed:", err)
|
||||
services.ResponseInternalServerError500ProcessError(w, err)
|
||||
return
|
||||
} else {
|
||||
// multi-tenancy solution
|
||||
var tenantID, where string
|
||||
//var cols []string
|
||||
if tenantName != "" {
|
||||
where = fmt.Sprintf("status='1' and tenant_name='%s'", tenantName)
|
||||
tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_id", where)
|
||||
var response services.MapResponse
|
||||
if neInfo.NeId == neId && neInfo.NeId != "" {
|
||||
requestURI2NF := fmt.Sprintf("http://%s:%v%s", neInfo.IP, neInfo.Port, r.RequestURI)
|
||||
log.Debug("requestURI2NF:", requestURI2NF)
|
||||
resp, err := client.R().
|
||||
EnableTrace().
|
||||
SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
|
||||
SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
|
||||
Get(requestURI2NF)
|
||||
if err != nil {
|
||||
log.Error("Failed to Get from NF:", err)
|
||||
services.ResponseInternalServerError500ProcessError(w, err)
|
||||
return
|
||||
} else {
|
||||
userName := ctx.LoginUserToUserName(r)
|
||||
where = fmt.Sprintf("status='1' and user_name='%s'", userName)
|
||||
tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_user", "tenant_id", where)
|
||||
where = fmt.Sprintf("status='1' and tenant_id='%s'", tenantID)
|
||||
tenantName, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_name", where)
|
||||
}
|
||||
if tenantID == "" {
|
||||
var response UEInfoResponse
|
||||
_ = json.Unmarshal(resp.Body(), &response)
|
||||
for i := 0; i < len(response.Data); i++ {
|
||||
where = fmt.Sprintf("status='1' and tenancy_type='IMSI' and '%s' like tenancy_key", response.Data[i].IMSI[5:])
|
||||
tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "parent_id", where)
|
||||
// multi-tenancy solution
|
||||
var tenantID, where string
|
||||
//var cols []string
|
||||
if tenantName != "" {
|
||||
where = fmt.Sprintf("status='1' and tenant_name='%s'", tenantName)
|
||||
tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_id", where)
|
||||
} else {
|
||||
userName := ctx.LoginUserToUserName(r)
|
||||
where = fmt.Sprintf("status='1' and user_name='%s'", userName)
|
||||
tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_user", "tenant_id", where)
|
||||
where = fmt.Sprintf("status='1' and tenant_id='%s'", tenantID)
|
||||
tenantName, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_name", where)
|
||||
log.Tracef("tenantName: %s tenantID: %s", tenantName, tenantID)
|
||||
response.Data[i].TenantName = tenantName
|
||||
}
|
||||
services.ResponseWithJson(w, resp.StatusCode(), &response)
|
||||
} else {
|
||||
var tenantUEInfos []TenantUEInfo
|
||||
var ueInfos UEInfoResponse
|
||||
log.Trace("body:", string(resp.Body()))
|
||||
_ = json.Unmarshal(resp.Body(), &ueInfos)
|
||||
log.Trace("ueInfos:", ueInfos)
|
||||
for _, n := range ueInfos.Data {
|
||||
log.Trace("tenantID, n.IMSI[5:]:", tenantID, n.IMSI[5:])
|
||||
// "imsi": "imsi-460000100029999",
|
||||
where = fmt.Sprintf("status='1' and parent_id='%s' and tenancy_type='IMSI' and '%s' like tenancy_key", tenantID, n.IMSI[5:])
|
||||
has, err := dborm.XormExistTableOne("sys_tenant", where)
|
||||
if err == nil && has {
|
||||
n.TenantName = tenantName
|
||||
tenantUEInfos = append(tenantUEInfos, n)
|
||||
if tenantID == "" {
|
||||
var response UEInfoResponse
|
||||
_ = json.Unmarshal(resp.Body(), &response)
|
||||
for i := 0; i < len(response.Data); i++ {
|
||||
where = fmt.Sprintf("status='1' and tenancy_type='IMSI' and '%s' like tenancy_key", response.Data[i].IMSI[5:])
|
||||
tenantID, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "parent_id", where)
|
||||
where = fmt.Sprintf("status='1' and tenant_id='%s'", tenantID)
|
||||
tenantName, _ = dborm.XormGetSingleColStringByWhere("sys_tenant", "tenant_name", where)
|
||||
log.Tracef("tenantName: %s tenantID: %s", tenantName, tenantID)
|
||||
response.Data[i].TenantName = tenantName
|
||||
}
|
||||
services.ResponseWithJson(w, resp.StatusCode(), &response)
|
||||
return
|
||||
} else {
|
||||
var tenantUEInfos []TenantUEInfo
|
||||
var ueInfos UEInfoResponse
|
||||
log.Trace("body:", string(resp.Body()))
|
||||
_ = json.Unmarshal(resp.Body(), &ueInfos)
|
||||
log.Trace("ueInfos:", ueInfos)
|
||||
for _, n := range ueInfos.Data {
|
||||
log.Trace("tenantID, n.IMSI[5:]:", tenantID, n.IMSI[5:])
|
||||
// "imsi": "imsi-460000100029999",
|
||||
where = fmt.Sprintf("status='1' and parent_id='%s' and tenancy_type='IMSI' and '%s' like tenancy_key", tenantID, n.IMSI[5:])
|
||||
has, err := dborm.XormExistTableOne("sys_tenant", where)
|
||||
if err == nil && has {
|
||||
n.TenantName = tenantName
|
||||
tenantUEInfos = append(tenantUEInfos, n)
|
||||
}
|
||||
}
|
||||
var response UEInfoResponse
|
||||
response.Data = tenantUEInfos
|
||||
services.ResponseWithJson(w, resp.StatusCode(), &response)
|
||||
return
|
||||
}
|
||||
var response UEInfoResponse
|
||||
response.Data = tenantUEInfos
|
||||
services.ResponseWithJson(w, resp.StatusCode(), &response)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
services.ResponseWithJson(w, http.StatusOK, response)
|
||||
}
|
||||
|
||||
// POST PCF User Info from NF/NFs
|
||||
|
||||
Reference in New Issue
Block a user