From 737c3dd368ead2043e2e5c29a31fab2bb1d765b3 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Sat, 6 Jul 2024 18:28:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E7=BD=91=E5=85=83=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=AE=89=E8=A3=85MME=E5=86=99=E5=85=A5host=E6=96=87=E4=BB=B6ip?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ne_version.impl.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/modules/network_element/service/ne_version.impl.go b/src/modules/network_element/service/ne_version.impl.go index d17f475b..caea08f3 100644 --- a/src/modules/network_element/service/ne_version.impl.go +++ b/src/modules/network_element/service/ne_version.impl.go @@ -248,10 +248,11 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri smsHost := fmt.Sprintf("%s smsc.%s smsc", para5GData["SIP_IP"], imsOrgHost) cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s' /etc/hosts || echo '%s' | sudo tee -a /etc/hosts \n", smsHost, smsHost)) // adb - cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n") - cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"])) - cmdStrArr = append(cmdStrArr, "sudo service adb restart \n") - + if strings.Contains(pkgCmdStr, "adb") { + cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n") + cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"])) + cmdStrArr = append(cmdStrArr, "sudo service adb restart \n") + } cmdStrArr = append(cmdStrArr, "ims-stop || true && ims-start \n") // 30s后停止服务 // cmdStrArr = append(cmdStrArr, "nohup sh -c \"sleep 30s && sudo ims-stop\" > /dev/null 2>&1 & \n") @@ -326,9 +327,11 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/192.168.8.110/%s/g\" /usr/local/etc/udm/as.yaml \n", para5GData["SIP_IP"])) cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s udm' /etc/hosts || echo '%s udm' | sudo tee -a /etc/hosts \n", para5GData["UDM_IP"], para5GData["UDM_IP"])) // adb - cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n") - cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"])) - cmdStrArr = append(cmdStrArr, "sudo service adb restart \n") + if strings.Contains(pkgCmdStr, "adb") { + cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n") + cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"])) + cmdStrArr = append(cmdStrArr, "sudo service adb restart \n") + } } // SMF配置修改 if neTypeLower == "smf" { @@ -448,7 +451,7 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i 's/TAC = 1;/TAC = %s;/g' /usr/local/etc/mme/mme.conf \n", para5GData["TAC"])) // SMF开启 cmdStrArr = append(cmdStrArr, "sudo sed -i \"/^ *gxcfg:/,/^ *[^ ]/{s/enable: false/enable: true/;b};\" /usr/local/etc/smf/smf_conf.yaml \n") - cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s mme' /etc/hosts || echo '%s mme' | sudo tee -a /etc/hosts \n", para5GData["S11_MMEIP"], para5GData["S11_MMEIP"])) + cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s mme' /etc/hosts || echo '%s mme' | sudo tee -a /etc/hosts \n", para5GData["MME_IP"], para5GData["MME_IP"])) } // N3IWF配置修改 if neTypeLower == "n3iwf" { From 46f2c8fc89aaf18c2c9a170d3f600d20886ee146 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Tue, 9 Jul 2024 15:52:12 +0800 Subject: [PATCH 2/3] fix: adb rename to kvdb --- config/systemd/restagent.service | 2 +- features/state/getstate.go | 4 ++-- misc/omcsvc.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/systemd/restagent.service b/config/systemd/restagent.service index 9b680e14..61eb41fa 100644 --- a/config/systemd/restagent.service +++ b/config/systemd/restagent.service @@ -1,6 +1,6 @@ [Unit] Description=OMC rest agent daemon -After=network-online.target mysql.service adb.service +After=network-online.target mysql.service kvdb.service [Service] Type=simple diff --git a/features/state/getstate.go b/features/state/getstate.go index f41627f9..5edcfde4 100644 --- a/features/state/getstate.go +++ b/features/state/getstate.go @@ -510,7 +510,7 @@ func GetOneSysinfoFromNF(w http.ResponseWriter, r *http.Request) { if systemState.OsInfo != "" { osInfo = systemState.OsInfo } - dbInfo := "adb v1.0.1" + dbInfo := "kvdb v1.0.1" if systemState.OsInfo != "" { dbInfo = systemState.DbInfo } @@ -656,7 +656,7 @@ func GetAllSysinfoFromNF(w http.ResponseWriter, r *http.Request) { if systemState.OsInfo != "" { osInfo = systemState.OsInfo } - dbInfo := "adb v1.0.1" + dbInfo := "kvdb v1.0.1" if systemState.OsInfo != "" { dbInfo = systemState.DbInfo } diff --git a/misc/omcsvc.sh b/misc/omcsvc.sh index 9f99581a..ef5d18e8 100644 --- a/misc/omcsvc.sh +++ b/misc/omcsvc.sh @@ -1,7 +1,7 @@ #!/bin/bash -ProcList="restagent crontask sshsvc captrace adb" -ProcListDesc="adb crontask sshsvc captrace restagent" +ProcList="restagent crontask sshsvc captrace kvdb" +ProcListDesc="kvdb crontask sshsvc captrace restagent" BinDir=/usr/local/omc/bin From b1ca79726682af40192d7a66686ec4ca27d42628 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Tue, 9 Jul 2024 16:13:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81kvdb=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=8C=85=E5=AE=89=E8=A3=85=EF=BC=8C=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=BC=82=E5=B8=B8=E5=88=A0=E9=99=A4=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=81=BF=E5=85=8D=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/framework/utils/machine/launch.go | 2 +- .../network_element/service/ne_info.impl.go | 15 ++++++++- .../service/ne_version.impl.go | 31 ++++++++++++------- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/framework/utils/machine/launch.go b/src/framework/utils/machine/launch.go index ab680b41..bd9d9af9 100644 --- a/src/framework/utils/machine/launch.go +++ b/src/framework/utils/machine/launch.go @@ -76,7 +76,7 @@ func codeFileRead() (map[string]any, error) { // 序列化Map mapData, err = parse.ConvertConfigToMap("json", string(contentDe)) if err != nil { - logger.Warnf("NeConfPara5GRead ConvertConfigToMap => %s", err.Error()) + logger.Warnf("CodeFileRead ConvertConfigToMap => %s", err.Error()) return mapData, fmt.Errorf("content error") } return mapData, nil diff --git a/src/modules/network_element/service/ne_info.impl.go b/src/modules/network_element/service/ne_info.impl.go index 7b5041ca..51497725 100644 --- a/src/modules/network_element/service/ne_info.impl.go +++ b/src/modules/network_element/service/ne_info.impl.go @@ -679,6 +679,18 @@ func (r *NeInfoImpl) NeConfPara5GWirte(content map[string]any, syncNE []string) // NeConfPara5GConvert 网元公共配置数据转化 content网元公共配置文件读取内容 func (r *NeInfoImpl) neConfPara5GDataConvert(content map[string]any) map[string]string { + defer func() { + if err := recover(); err != nil { + logger.Errorf("NeConfPara5GDataConvert panic: %v", err) + // 文件异常就删除配置 + omcFilePath := "/usr/local/etc/omc/para5G.yaml" + if runtime.GOOS == "windows" { + omcFilePath = fmt.Sprintf("C:%s", omcFilePath) + } + os.Remove(omcFilePath) + } + }() + basic := content["basic"].(map[string]any) external := content["external"].(map[string]any) sbi := content["sbi"].(map[string]any) @@ -771,7 +783,6 @@ func (r *NeInfoImpl) neConfPara5GDataConvert(content map[string]any) map[string] "AMF_IP": sbi["amf_ip"].(string), "AUSF_IP": sbi["ausf_ip"].(string), "UDM_IP": sbi["udm_ip"].(string), - "ADB_IP": sbi["adb_ip"].(string), "SMF_IP": sbi["smf_ip"].(string), "PCF_IP": sbi["pcf_ip"].(string), "NSSF_IP": sbi["nssf_ip"].(string), @@ -781,5 +792,7 @@ func (r *NeInfoImpl) neConfPara5GDataConvert(content map[string]any) map[string] "NEF_IP": sbi["nef_ip"].(string), "MME_IP": sbi["mme_ip"].(string), "N3IWF_IP": sbi["n3iwf_ip"].(string), + + "DB_IP": sbi["db_ip"].(string), } } diff --git a/src/modules/network_element/service/ne_version.impl.go b/src/modules/network_element/service/ne_version.impl.go index caea08f3..da2dbfed 100644 --- a/src/modules/network_element/service/ne_version.impl.go +++ b/src/modules/network_element/service/ne_version.impl.go @@ -247,12 +247,7 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s' /etc/hosts || echo '%s' | sudo tee -a /etc/hosts \n", mrfcHost, mrfcHost)) smsHost := fmt.Sprintf("%s smsc.%s smsc", para5GData["SIP_IP"], imsOrgHost) cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s' /etc/hosts || echo '%s' | sudo tee -a /etc/hosts \n", smsHost, smsHost)) - // adb - if strings.Contains(pkgCmdStr, "adb") { - cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n") - cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"])) - cmdStrArr = append(cmdStrArr, "sudo service adb restart \n") - } + cmdStrArr = append(cmdStrArr, "ims-stop || true && ims-start \n") // 30s后停止服务 // cmdStrArr = append(cmdStrArr, "nohup sh -c \"sleep 30s && sudo ims-stop\" > /dev/null 2>&1 & \n") @@ -326,12 +321,6 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/dnn: ims/dnn: %s/g\" /usr/local/etc/udm/dnn.yaml \n", para5GData["DNN_IMS"])) cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/192.168.8.110/%s/g\" /usr/local/etc/udm/as.yaml \n", para5GData["SIP_IP"])) cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s udm' /etc/hosts || echo '%s udm' | sudo tee -a /etc/hosts \n", para5GData["UDM_IP"], para5GData["UDM_IP"])) - // adb - if strings.Contains(pkgCmdStr, "adb") { - cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n") - cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"])) - cmdStrArr = append(cmdStrArr, "sudo service adb restart \n") - } } // SMF配置修改 if neTypeLower == "smf" { @@ -478,6 +467,24 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri } } + // 安装操作有redis安装时需要重启 + if action == "install" && (neTypeLower == "ims" || neTypeLower == "udm") { + // adb + if strings.Contains(pkgCmdStr, "adb") { + para5GData := NewNeInfoImpl.Para5GData + cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n") + cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["DB_IP"])) + cmdStrArr = append(cmdStrArr, "sudo service adb restart \n") + } + // kvdb + if strings.Contains(pkgCmdStr, "kvdb") { + para5GData := NewNeInfoImpl.Para5GData + cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/kvdb/default/kvdb.conf /usr/local/etc/kvdb/kvdb.conf \n") + cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/kvdb/kvdb.conf \n", para5GData["DB_IP"])) + cmdStrArr = append(cmdStrArr, "sudo service kvdb restart \n") + } + } + // 删除软件包 cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo rm %s \n", strings.Join(neFilePaths, " "))) // 结束