From c09bd4dbf3331854835e3b119de2981c80fb1b72 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Fri, 1 Mar 2024 19:00:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20OMC=E7=BD=91=E5=85=83=E9=85=8D=E7=BD=AEo?= =?UTF-8?q?mcNeConfig=E6=8E=A5=E5=8F=A3=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- features/cm/ne.go | 36 +++++------------------------------- features/cm/param.go | 35 ++++++++++++++++++++++++++++++++++- lib/routes/routes.go | 3 --- 3 files changed, 39 insertions(+), 35 deletions(-) diff --git a/features/cm/ne.go b/features/cm/ne.go index 16e96f2b..0b28347d 100644 --- a/features/cm/ne.go +++ b/features/cm/ne.go @@ -23,8 +23,6 @@ import ( ) var ( - UriParamOmcNeConfig = config.DefaultUriPrefix + "/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig" - UriOmcNeConfig = config.DefaultUriPrefix + "/systemManagement/v1/elementType/omc/objectType/config/omcNeConfig" // NE CM export/import NeCmUri = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/cm" // NE info @@ -36,11 +34,9 @@ var ( // nf instance action uri, action: start/stop/restart UriNeInstance = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/instance/{action}" - CustomUriParamOmcNeConfig = config.UriPrefix + "/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig" - CustomUriOmcNeConfig = config.UriPrefix + "/systemManagement/v1/elementType/omc/objectType/config/omcNeConfig" - CustomNeCmUri = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/cm" - CustomUriNeInfo = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/neInfo" - CustomUriNeCmFile = config.UriPrefix + "/systemManagement/{apiVersion}/{neType}/neBackup/{fileName}" + CustomNeCmUri = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/cm" + CustomUriNeInfo = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/neInfo" + CustomUriNeCmFile = config.UriPrefix + "/systemManagement/{apiVersion}/{neType}/neBackup/{fileName}" // service action uri, action: start/stop/restart CustomUriNeService = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/service/{action}" // nf instance action uri, action: start/stop/restart @@ -170,7 +166,7 @@ func PostNeInfo(w http.ResponseWriter, r *http.Request) { } else { hostUri := global.CombineHostUri(neInfo.Ip, neInfo.Port) //hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port) - apiUri := fmt.Sprintf(UriParamOmcNeConfig, strings.ToLower(neInfo.NeType)) + apiUri := fmt.Sprintf("%s/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig", config.DefaultUriPrefix, strings.ToLower(neInfo.NeType)) requestURI2NF := fmt.Sprintf("%s%s", hostUri, apiUri) log.Debug("requestURI2NF:", requestURI2NF) @@ -280,7 +276,7 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) { } else { hostUri := global.CombineHostUri(neInfo.Ip, neInfo.Port) //hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port) - apiUri := fmt.Sprintf(UriParamOmcNeConfig, neTypeLower) + apiUri := fmt.Sprintf("%s/systemManagement/v1/elementType/%s/objectType/config/omcNeConfig", config.DefaultUriPrefix, neTypeLower) requestURI2NF := fmt.Sprintf("%s%s", hostUri, apiUri) log.Debug("requestURI2NF:", requestURI2NF) @@ -338,28 +334,6 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) { } } -func PutOMCNeConfig(w http.ResponseWriter, r *http.Request) { - vars := mux.Vars(r) - neType := vars["elementTypeValue"] - if neType == "" { - log.Error("elementTypeValue is empty") - services.ResponseNotFound404UriNotExist(w, r) - return - } - body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen)) - if err != nil { - log.Error("Failed to io.ReadAll:", err) - services.ResponseNotFound404UriNotExist(w, r) - return - } - - neInfo := new(dborm.NeInfo) - _ = json.Unmarshal(body, neInfo) - neInfo.NeType = strings.ToUpper(neType) - - services.ResponseStatusOK204NoContent(w) -} - func DeleteNeInfo(w http.ResponseWriter, r *http.Request) { log.Debug("DeleteNeInfo processing... ") diff --git a/features/cm/param.go b/features/cm/param.go index aa396f88..21d48c2f 100644 --- a/features/cm/param.go +++ b/features/cm/param.go @@ -1,6 +1,8 @@ package cm import ( + "strings" + "ems.agt/lib/dborm" "ems.agt/lib/global" "ems.agt/lib/log" @@ -163,8 +165,14 @@ func PutParamConfigToNF(w http.ResponseWriter, r *http.Request) { services.ResponseNotFound404UriNotExist(w, r) return } - neId := services.GetUriParamString(r, "ne_id", ",", false, false) + // OMC配置接口 /api/rest/systemManagement/v1/elementType/omc/objectType/config/omcNeConfig + if v, ok := vars["paraName"]; ok && v == "omcNeConfig" && strings.ToLower(neType) == "omc" { + PutOMCNeConfig(w, r) + return + } + + neId := services.GetUriParamString(r, "ne_id", ",", false, false) // no, _ := strconv.ParseInt(neId, 10, 64) neInfo, err := dborm.XormGetNeInfo(neType, neId) if err != nil { @@ -199,6 +207,31 @@ func PutParamConfigToNF(w http.ResponseWriter, r *http.Request) { services.ResponseWithJson(w, http.StatusNoContent, response) } +// PutOMCNeConfig 网元OMC配置 +// +// 目前没配置，返回204 +func PutOMCNeConfig(w http.ResponseWriter, r *http.Request) { + // vars := mux.Vars(r) + // neType := vars["elementTypeValue"] + // if neType == "" { + // log.Error("elementTypeValue is empty") + // services.ResponseNotFound404UriNotExist(w, r) + // return + // } + // body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen)) + // if err != nil { + // log.Error("Failed to io.ReadAll:", err) + // services.ResponseNotFound404UriNotExist(w, r) + // return + // } + + // neInfo := new(dborm.NeInfo) + // _ = json.Unmarshal(body, neInfo) + // neInfo.NeType = strings.ToUpper(neType) + + services.ResponseStatusOK204NoContent(w) +} + func DeleteParamConfigToNF(w http.ResponseWriter, r *http.Request) { log.Debug("DeleteParamConfigToNF processing... ") diff --git a/lib/routes/routes.go b/lib/routes/routes.go index f3e0f6de..30c3ea4e 100644 --- a/lib/routes/routes.go +++ b/lib/routes/routes.go @@ -166,9 +166,6 @@ func init() { Register("PUT", cm.CustomUriNeInfo, cm.PutNeInfo, nil) Register("DELETE", cm.CustomUriNeInfo, cm.DeleteNeInfo, nil) - Register("PUT", cm.UriOmcNeConfig, cm.PutOMCNeConfig, nil) - Register("PUT", cm.CustomUriOmcNeConfig, cm.PutOMCNeConfig, nil) - //ne service action handle Register("POST", cm.UriNeService, cm.PostNeServiceAction, nil) //ne service action handle