From 766c248bfd87cd7712d6205ff2fa3f4a338fe0b2 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Wed, 4 Sep 2024 11:55:39 +0800
Subject: [PATCH] fix: omc upgrade in UI issue

---
 .../service/ne_version.impl.go                | 40 ++++++++++++++-----
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/modules/network_element/service/ne_version.impl.go b/src/modules/network_element/service/ne_version.impl.go
index 489fb2b1..b860b59c 100644
--- a/src/modules/network_element/service/ne_version.impl.go
+++ b/src/modules/network_element/service/ne_version.impl.go
@@ -189,24 +189,32 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri
 	neTypeLower := strings.ToLower(neType)
 	// 命令终止结束标记
 	okFlagStr := fmt.Sprintf("%s version %s successful!", neTypeLower, action)
-	// 安装软件包
-	pkgCmdStr := fmt.Sprintf("sudo dpkg -i %s", strings.Join(neFilePaths, " "))
-	fileExt := filepath.Ext(strings.ToLower(neFilePaths[0]))
-	if strings.HasSuffix(fileExt, "rpm") {
-		pkgCmdStr = fmt.Sprintf("sudo rpm -Uvh %s", strings.Join(neFilePaths, " "))
-	}
 
 	// 组合命令输入
+	pkgCmdStr := ""
 	cmdStrArr := []string{}
 	if neType == "OMC" {
 		omcStrArr := []string{}
-		omcStrArr = append(omcStrArr, pkgCmdStr)
 		if action == "install" {
-			omcStrArr = append(omcStrArr, "/usr/local/omc/bin/setomc.sh -m install") // 初始化数据库
+			// 安装软件包
+			pkgCmdStr = fmt.Sprintf("sudo M_PARAM=install dpkg -i %s", strings.Join(neFilePaths, " "))
+			fileExt := filepath.Ext(strings.ToLower(neFilePaths[0]))
+			if strings.HasSuffix(fileExt, "rpm") {
+				pkgCmdStr = fmt.Sprintf("sudo M_PARAM=install rpm -Uvh %s", strings.Join(neFilePaths, " "))
+			}
+			omcStrArr = append(omcStrArr, pkgCmdStr)
+			// omcStrArr = append(omcStrArr, "/usr/local/omc/bin/setomc.sh -m install") // 初始化数据库
 		} else {
-			omcStrArr = append(omcStrArr, "/usr/local/omc/bin/setomc.sh -m upgrade") // 升级数据库
+			// 升级软件包
+			pkgCmdStr = fmt.Sprintf("sudo M_PARAM=upgrade dpkg -i %s", strings.Join(neFilePaths, " "))
+			fileExt := filepath.Ext(strings.ToLower(neFilePaths[0]))
+			if strings.HasSuffix(fileExt, "rpm") {
+				pkgCmdStr = fmt.Sprintf("sudo M_PARAM=upgrade rpm -Uvh %s", strings.Join(neFilePaths, " "))
+			}
+			omcStrArr = append(omcStrArr, pkgCmdStr)
+			// omcStrArr = append(omcStrArr, "/usr/local/omc/bin/setomc.sh -m upgrade") // 升级数据库
 		}
-		omcStrArr = append(omcStrArr, "sudo systemctl restart restagent")                        // 重启服务
+		//omcStrArr = append(omcStrArr, "sudo systemctl restart restagent")                        // 重启服务
 		omcStrArr = append(omcStrArr, fmt.Sprintf("sudo rm %s", strings.Join(neFilePaths, " "))) // 删除软件包
 
 		// 2s后安装
@@ -215,6 +223,12 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri
 		cmdStrArr = append(cmdStrArr, fmt.Sprintf("echo '%s' \n", okFlagStr))
 		return okFlagStr, cmdStrArr, nil
 	} else if neType == "IMS" {
+		// 安装软件包
+		pkgCmdStr = fmt.Sprintf("sudo dpkg -i %s", strings.Join(neFilePaths, " "))
+		fileExt := filepath.Ext(strings.ToLower(neFilePaths[0]))
+		if strings.HasSuffix(fileExt, "rpm") {
+			pkgCmdStr = fmt.Sprintf("sudo rpm -Uvh %s", strings.Join(neFilePaths, " "))
+		}
 		if action == "install" {
 			para5GData := NewNeInfoImpl.Para5GData
 			cmdStrArr = append(cmdStrArr, pkgCmdStr+" \n")
@@ -257,6 +271,12 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri
 			cmdStrArr = append(cmdStrArr, "ims-start \n")
 		}
 	} else {
+		// 安装软件包
+		pkgCmdStr = fmt.Sprintf("sudo dpkg -i %s", strings.Join(neFilePaths, " "))
+		fileExt := filepath.Ext(strings.ToLower(neFilePaths[0]))
+		if strings.HasSuffix(fileExt, "rpm") {
+			pkgCmdStr = fmt.Sprintf("sudo rpm -Uvh %s", strings.Join(neFilePaths, " "))
+		}
 		if action == "install" {
 			para5GData := NewNeInfoImpl.Para5GData
 			cmdStrArr = append(cmdStrArr, pkgCmdStr+" \n")