From 4c6596c417b6c0fb6c3bb4bdc74b2e86dfcfedd9 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 9 Jul 2024 10:08:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E7=9B=B4=E8=BF=9E?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=94=99=E8=AF=AF=E5=8C=85=E8=A3=85=EF=BC=8C?= =?UTF-8?q?=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF=E8=BE=93=E5=87=BA=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../network_element/fetch_link/ne_config.go | 51 ++++++++++--------- .../network_element/fetch_link/ne_state.go | 6 +-- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/src/modules/network_element/fetch_link/ne_config.go b/src/modules/network_element/fetch_link/ne_config.go index c385e4d1..3641cda9 100644 --- a/src/modules/network_element/fetch_link/ne_config.go +++ b/src/modules/network_element/fetch_link/ne_config.go @@ -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 diff --git a/src/modules/network_element/fetch_link/ne_state.go b/src/modules/network_element/fetch_link/ne_state.go index 4ed27aa3..9a5feb39 100644 --- a/src/modules/network_element/fetch_link/ne_state.go +++ b/src/modules/network_element/fetch_link/ne_state.go @@ -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 }