From 10ac5629a829fa97f2f689acae60fba2f868b183 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 29 Apr 2024 18:21:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E5=85=83OAM=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=BB=98=E8=AE=A4=E6=A0=BC=E5=BC=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../network_element/service/ne_info.impl.go | 54 ++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/src/modules/network_element/service/ne_info.impl.go b/src/modules/network_element/service/ne_info.impl.go index 2680dd53..814cd76d 100644 --- a/src/modules/network_element/service/ne_info.impl.go +++ b/src/modules/network_element/service/ne_info.impl.go @@ -486,6 +486,52 @@ func (r *NeInfoImpl) NeConfigFileWirte(neInfo model.NeInfo, filePath, fileType s return nil } +// neConfOAMData 网元OAM配置文件默认格式数据 +func (r *NeInfoImpl) neConfOAMData() map[string]any { + return map[string]any{ + "httpManageCfg": map[string]any{ + "ipType": "ipv4", + // 必改 + "ipv4": "172.60.5.2", + "ipv6": "", + "port": 33030, + "scheme": "http", + }, + "oamConfig": map[string]any{ + "enable": true, + "ipType": "ipv4", + // 必改 + "ipv4": "172.60.5.1", + "ipv6": "", + "port": 33030, + "scheme": "http", + // 必改 + "neConfig": map[string]any{ + "neId": "001", + "rmUid": "4400HX1XXX001", + "neName": "XXX_001", + "dn": "-", + "vendorName": "GD", + "province": "-", + "pvFlag": "PNF", + }, + }, + "snmpConfig": map[string]any{ + "enable": false, + "ipType": "ipv4", + // 必改 + "ipv4": "172.60.5.2", + "ipv6": "", + "port": 4957, + }, + "kpiConfig": map[string]any{ + "enable": true, + // 必改 + "timer": 60, + }, + } +} + // NeConfOAMRead 网元OAM配置文件读取 func (r *NeInfoImpl) NeConfOAMRead(neType, neId string) (map[string]any, error) { neTypeLower := strings.ToLower(neType) @@ -499,8 +545,12 @@ func (r *NeInfoImpl) NeConfOAMRead(neType, neId string) (map[string]any, error) // 读取文件内容 bytes, err := os.ReadFile(localFilePath) if err != nil { - logger.Warnf("NeConfOAMRead ReadFile => %s", err.Error()) - return nil, fmt.Errorf("read file error") + // logger.Warnf("NeConfOAMRead ReadFile => %s", err.Error()) + // return nil, fmt.Errorf("read file error") + // 无保留文件时返回默认文件数据 + oamData := r.neConfOAMData() + r.NeConfOAMWirte(neType, neId, oamData, false) + return oamData, nil } content := string(bytes)