perf: 优化para5G参数,移除网元版本新增修改删除接口

src/modules/network_element/service/ne_version.impl.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 	"time"
 
-	"be.ems/lib/core/utils/parse"
 	"be.ems/src/framework/utils/file"
 	"be.ems/src/modules/network_element/model"
 	"be.ems/src/modules/network_element/repository"
@@ -84,18 +83,6 @@ func (r *NeVersionImpl) SelectByNeTypeAndNeID(neType, neId string) model.NeVersi
 	return model.NeVersion{}
 }
 
-// CheckUniqueTypeAndID 校验网元类型和网元ID是否唯一
-func (r *NeVersionImpl) CheckUniqueTypeAndID(neType, neId, id string) bool {
-	uniqueId := r.neVersionRepository.CheckUniqueTypeAndID(model.NeVersion{
-		NeType: neType,
-		NeId:   neId,
-	})
-	if uniqueId == id {
-		return true
-	}
-	return uniqueId == ""
-}
-
 // Operate 操作版本上传到网元主机执行命令
 //
 // action 安装行为：install upgrade rollback
@@ -143,7 +130,6 @@ func (r *NeVersionImpl) Operate(action string, neVersion model.NeVersion, preinp
 		return "", fmt.Errorf("error uploading package")
 	}
 
-	var para5GData map[string]string
 	if action == "install" {
 		// ========= 网元公共配置文件 start =========
 		para5GMap, err := NewNeInfoImpl.NeConfPara5GRead()
@@ -153,7 +139,6 @@ func (r *NeVersionImpl) Operate(action string, neVersion model.NeVersion, preinp
 		if err := NewNeInfoImpl.NeConfPara5GWirte(para5GMap, []string{fmt.Sprintf("%s@%s", neInfo.NeType, neInfo.NeId)}); err != nil {
 			return "", fmt.Errorf("error wirte OAM file info")
 		}
-		para5GData = NewNeInfoImpl.NeConfPara5GDataConvert(para5GMap)
 		// ========= 网元公共配置文件 end ===========
 	}
 
@@ -185,6 +170,7 @@ func (r *NeVersionImpl) Operate(action string, neVersion model.NeVersion, preinp
 			return "", fmt.Errorf("error file package not ims")
 		}
 		if action == "install" {
+			para5GData := NewNeInfoImpl.Para5GData
 			cmdStrArr = append(cmdStrArr, pkgCmdStr+" \n")
 			cmdStrArr = append(cmdStrArr, "sudo ims-stop || true && sudo ims-start \n")
 			// 公网 PLMN地址
@@ -202,6 +188,7 @@ func (r *NeVersionImpl) Operate(action string, neVersion model.NeVersion, preinp
 		}
 	} else {
 		if action == "install" {
+			para5GData := NewNeInfoImpl.Para5GData
 			cmdStrArr = append(cmdStrArr, pkgCmdStr+" \n")
 
 			// AMF配置修改
@@ -291,10 +278,10 @@ func (r *NeVersionImpl) Operate(action string, neVersion model.NeVersion, preinp
 				cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i '/- interfaceType: \"N6\"/,/gatewayIpv4: 192.168.1.254/s/gatewayIpv4: 192.168.1.254/gatewayIpv4: %s/' /usr/local/etc/upf/upfForwarder_1.yaml \n", para5GData["N6_GW"]))
 				cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i '/- interfaceType: \"N6\"/,/ueIpv4: 10.2.1.0/s/ueIpv4: 10.2.1.0/ueIpv4: %s'/' /usr/local/etc/upf/upfForwarder_1.yaml \n", para5GData["UE_IP"]))
 				cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i '/- interfaceType: \"N6\"/,/ueIpv4Mask: 255.255.255.0/s/ueIpv4Mask: 255.255.255.0/ueIpv4Mask: %s'/' /usr/local/etc/upf/upfForwarder_1.yaml \n", para5GData["UE_MASK"]))
-				// 轻量
+				// 轻量版
 				// cmdStrArr = append(cmdStrArr, "sudo sed -i \"s/192.168.8.191/0.0.0.0/g\" /usr/local/etc/upf/upfForwarder_1.yaml \n")
 				// cmdStrArr = append(cmdStrArr, "sudo sed -i \"s/type: upfd/type: tun/g\" /usr/local/etc/upf/upfForwarder_1.yaml \n")
-				// cmdStrArr = append(cmdStrArr, "sudo sed -i 's/driverType: \"vmxnet3\"/driverType: \"\"/g' /usr/local/etc/upf/upfForwarder_1.yaml \n")
+				// cmdStrArr = append(cmdStrArr, "sudo sed -i 's/driverType: vmxnet3/driverType: \"\"/g' /usr/local/etc/upf/upfForwarder_1.yaml \n")
 			}
 
 			// NRF配置修改
@@ -425,51 +412,7 @@ func (r *NeVersionImpl) Operate(action string, neVersion model.NeVersion, preinp
 	if strings.LastIndex(logMsg, okFlagStr) > 5 {
 		if action == "install" {
 			// ========= 网元OAM配置文件 start ==========
-			oamData, err := NewNeInfoImpl.NeConfOAMRead(neInfo.NeType, neInfo.NeId)
-			if oamData == nil || err != nil {
-				return "", fmt.Errorf("error read OAM file info")
-			}
-			// 网元HTTP服务
-			if v, ok := oamData["httpManageCfg"]; ok {
-				item := v.(map[string]any)
-				item["ipv4"] = neInfo.IP
-				item["port"] = neInfo.Port
-				oamData["httpManageCfg"] = item
-			}
-			// 对网管HTTP配置
-			if v, ok := oamData["oamConfig"]; ok {
-				item := v.(map[string]any)
-				item["enable"] = true
-				if omcIP, ok := para5GData["OMCIP"]; ok && omcIP != "" {
-					item["ipv4"] = omcIP
-				}
-				item["neConfig"] = map[string]string{
-					"neId":       neInfo.NeId,
-					"rmUid":      neInfo.RmUID,
-					"neName":     neInfo.NeName,
-					"dn":         neInfo.Dn,
-					"vendorName": neInfo.VendorName,
-					"province":   neInfo.Province,
-					"pvFlag":     neInfo.PvFlag,
-				}
-				oamData["oamConfig"] = item
-			}
-			// 对网管SNMP配置
-			if v, ok := oamData["snmpConfig"]; ok {
-				item := v.(map[string]any)
-				item["ipv4"] = neInfo.IP
-				oamData["snmpConfig"] = item
-			}
-			// 对网管KPI上报配置
-			if v, ok := oamData["kpiConfig"]; ok {
-				item := v.(map[string]any)
-				item["enable"] = true
-				if kpiTimer, ok := para5GData["KPI_TIMER"]; ok && kpiTimer != "" {
-					item["timer"] = parse.Number(kpiTimer)
-				}
-				oamData["kpiConfig"] = item
-			}
-			if err := NewNeInfoImpl.NeConfOAMWirte(neInfo.NeType, neInfo.NeId, oamData, true); err != nil {
+			if err := NewNeInfoImpl.NeConfOAMSync(neInfo, true); err != nil {
 				return "", fmt.Errorf("error wirte OAM file info")
 			}
 			// ========= 网元OAM配置文件 end ===========