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

fix: 网元直连配置错误包装，详细信息输出日志文件

Browse Source
This commit is contained in:
TsMask
2024-07-09 10:08:41 +08:00
parent 76167d6754
commit 4c6596c417
2 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/modules/network_element/fetch_link/ne_config.go
View File

@@ -26,12 +26,13 @@ func NeConfigOMC(neInfo model.NeInfo) (map[string]any, error) {
}, nil)
var resData map[string]any
if err != nil {
status := err.Error()
logger.Warnf("NeConfigOMC %s Put \"%s\"", status, neUrl)
if strings.HasPrefix(status, "201") || strings.HasPrefix(status, "204") {
errStr := err.Error()
logger.Warnf("NeConfigOMC Put \"%s\"", neUrl)
if strings.HasPrefix(errStr, "201") || strings.HasPrefix(errStr, "204") {
return resData, nil
}
return nil, err
logger.Errorf("NeConfigOMC %s", errStr)
return nil, fmt.Errorf("NeService Config OMC Update API Error")
}
// 200 成功无数据时
@@ -42,7 +43,7 @@ func NeConfigOMC(neInfo model.NeInfo) (map[string]any, error) {
// 序列化结果
err = json.Unmarshal(resBytes, &resData)
if err != nil {
logger.Warnf("NeConfigOMC Unmarshal %s", err.Error())
logger.Errorf("NeConfigOMC Unmarshal %s", err.Error())
return nil, err
}
@@ -55,15 +56,16 @@ func NeConfigInfo(neInfo model.NeInfo, paramName string) (map[string]any, error)
neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/config/%s", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType), paramName)
resBytes, err := fetch.Get(neUrl, nil, 1000)
if err != nil {
logger.Warnf("NeConfigInfo %s Get \"%s\"", err.Error(), neUrl)
return nil, err
logger.Warnf("NeConfigInfo Get \"%s\"", neUrl)
logger.Errorf("NeConfigInfo %s", err.Error())
return nil, fmt.Errorf("NeService Config Info API Error")
}
// 序列化结果
var resData map[string]any
err = json.Unmarshal(resBytes, &resData)
if err != nil {
logger.Warnf("NeConfigInfo Unmarshal %s", err.Error())
logger.Errorf("NeConfigInfo Unmarshal %s", err.Error())
return nil, err
}
return resData, nil
@@ -80,12 +82,13 @@ func NeConfigUpdate(neInfo model.NeInfo, paramName, loc string, data map[string]
resBytes, err := fetch.PutJSON(neUrl, data, nil)
var resData map[string]any
if err != nil {
status := err.Error()
logger.Warnf("NeConfigInfoEdit %s Put \"%s\"", status, neUrl)
if strings.HasPrefix(status, "201") || strings.HasPrefix(status, "204") {
errStr := err.Error()
logger.Warnf("NeConfigUpdate Put \"%s\"", neUrl)
if strings.HasPrefix(errStr, "201") || strings.HasPrefix(errStr, "204") {
return resData, nil
}
return nil, err
logger.Errorf("NeConfigUpdate %s", errStr)
return nil, fmt.Errorf("NeService Config Update API Error")
}
// 200 成功无数据时
@@ -96,7 +99,7 @@ func NeConfigUpdate(neInfo model.NeInfo, paramName, loc string, data map[string]
// 序列化结果
err = json.Unmarshal(resBytes, &resData)
if err != nil {
logger.Warnf("NeConfigInfoEdit Unmarshal %s", err.Error())
logger.Errorf("NeConfigUpdate Unmarshal %s", err.Error())
return nil, err
}
return resData, nil
@@ -109,12 +112,13 @@ func NeConfigInstall(neInfo model.NeInfo, paramName, loc string, data map[string
resBytes, err := fetch.PostJSON(neUrl, data, nil)
var resData map[string]any
if err != nil {
status := err.Error()
logger.Warnf("NeConfigInfoAdd %s Post \"%s\"", status, neUrl)
if strings.HasPrefix(status, "201") || strings.HasPrefix(status, "204") {
errStr := err.Error()
logger.Warnf("NeConfigInfoAdd Post \"%s\"", neUrl)
if strings.HasPrefix(errStr, "201") || strings.HasPrefix(errStr, "204") {
return resData, nil
}
return nil, err
logger.Errorf("NeConfigInfoAdd %s", errStr)
return nil, fmt.Errorf("NeService Config Add API Error")
}
// 200 成功无数据时
@@ -125,7 +129,7 @@ func NeConfigInstall(neInfo model.NeInfo, paramName, loc string, data map[string
// 序列化结果
err = json.Unmarshal(resBytes, &resData)
if err != nil {
logger.Warnf("NeConfigInfoAdd Unmarshal %s", err.Error())
logger.Errorf("NeConfigInfoAdd Unmarshal %s", err.Error())
return nil, err
}
return resData, nil
@@ -138,12 +142,13 @@ func NeConfigDelete(neInfo model.NeInfo, paramName, loc string) (map[string]any,
resBytes, err := fetch.Delete(neUrl, nil)
var resData map[string]any
if err != nil {
status := err.Error()
logger.Warnf("NeConfigInfoDel %s Delete \"%s\"", status, neUrl)
if strings.HasPrefix(status, "201") || strings.HasPrefix(status, "204") {
errStr := err.Error()
logger.Warnf("NeConfigDelete Delete \"%s\"", neUrl)
if strings.HasPrefix(errStr, "201") || strings.HasPrefix(errStr, "204") {
return resData, nil
}
return nil, err
logger.Errorf("NeConfigDelete %s", errStr)
return nil, fmt.Errorf("NeService Config Update API Error")
}
// 200 成功无数据时
@@ -154,7 +159,7 @@ func NeConfigDelete(neInfo model.NeInfo, paramName, loc string) (map[string]any,
// 序列化结果
err = json.Unmarshal(resBytes, &resData)
if err != nil {
logger.Warnf("NeConfigInfoDel Unmarshal %s", err.Error())
logger.Errorf("NeConfigInfoDel Unmarshal %s", err.Error())
return nil, err
}
return resData, nil

6
src/modules/network_element/fetch_link/ne_state.go
View File

@@ -17,15 +17,15 @@ func NeState(neInfo model.NeInfo) (map[string]any, error) {
neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/systemState", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType))
resBytes, err := fetch.Get(neUrl, nil, 1000)
if err != nil {
logger.Warnf("NeState %s", err.Error())
return nil, err
logger.Errorf("NeState %s", err.Error())
return nil, fmt.Errorf("NeService System State API Error")
}
// 序列化结果
var resData map[string]any
err = json.Unmarshal(resBytes, &resData)
if err != nil {
logger.Warnf("NeState Unmarshal %s", err.Error())
logger.Errorf("NeState Unmarshal %s", err.Error())
return nil, err
}