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

fix: 网元版本安装OMC升级重启自己

Browse Source
This commit is contained in:
TsMask
2024-06-03 18:27:58 +08:00
parent 8af452872d
commit 44de9009dd
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/network_element/service/ne_license.impl.go
View File

@@ -183,7 +183,7 @@ func (r *NeLicenseImpl) UploadLicense(neLicense model.NeLicense) error {
if neTypeLower == "ims" { if neTypeLower == "ims" {
cmdStr = "sudo ims-stop || true && sudo ims-start" cmdStr = "sudo ims-stop || true && sudo ims-start"
} else if neTypeLower == "omc" { } else if neTypeLower == "omc" {
cmdStr = "sudo /usr/local/omc/bin/omcsvc.sh restart" cmdStr = "sudo systemctl restart restagent"
} }
sshClient.RunCMD(cmdStr) sshClient.RunCMD(cmdStr)
} }

15
src/modules/network_element/service/ne_version.impl.go
View File

@@ -125,10 +125,6 @@ func (r *NeVersionImpl) Operate(action string, neVersion model.NeVersion, preinp
if err != nil { if err != nil {
return "", err return "", err
} }
// 操作自己omc时
if neVersion.NeType == "OMC" {
return sshClient.RunCMD(fmt.Sprintf("nohup sh -c \"sleep 3s && %s\" > /dev/null 2>&1 & \n", strings.Join(cmdStrArr, " && ")))
}
// ========= 执行阶段 ========= // ========= 执行阶段 =========
commandLine, err := r.operateRun(sshClient, preinput, cmdStrArr, neVersion.NeType, okFlagStr) commandLine, err := r.operateRun(sshClient, preinput, cmdStrArr, neVersion.NeType, okFlagStr)
@@ -203,14 +199,15 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri
// 组合命令输入 // 组合命令输入
cmdStrArr := []string{} cmdStrArr := []string{}
if neType == "OMC" { if neType == "OMC" {
cmdStrArr = append(cmdStrArr, pkgCmdStr) cmdStrArr = append(cmdStrArr, pkgCmdStr+" \n")
if action == "install" { if action == "install" {
cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m install") // 初始化数据库 cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m install \n") // 初始化数据库
} else { } else {
cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/omcsvc.sh stop") cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m upgrade \n") // 升级数据库
cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/setomc.sh -m upgrade") // 升级数据库
} }
cmdStrArr = append(cmdStrArr, "sudo /usr/local/omc/bin/omcsvc.sh restart")
// 2s后重启服务
cmdStrArr = append(cmdStrArr, "nohup sh -c \"sleep 2s && sudo systemctl restart restagent\" > /dev/null 2>&1 & \n")
} else if neType == "IMS" { } else if neType == "IMS" {
if action == "install" { if action == "install" {
para5GData := NewNeInfoImpl.Para5GData para5GData := NewNeInfoImpl.Para5GData