Merge remote-tracking branch 'origin/lichang' into lite
This commit is contained in:
@@ -821,7 +821,7 @@ func (r NeInfo) NeConfPara5GRead() (map[string]any, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// NeConfPara5GWirte 网元公共配置文件写入 content内容 syncNE同步到网元端NeType@NeId
|
// NeConfPara5GWirte 网元公共配置文件写入 content内容 syncNE同步到网元端NeType@NeId
|
||||||
func (r NeInfo) NeConfPara5GWirte(content map[string]any, syncNE []string) error {
|
func (r *NeInfo) NeConfPara5GWirte(content map[string]any, syncNE []string) error {
|
||||||
// 网管本地路径
|
// 网管本地路径
|
||||||
omcFilePath := "/usr/local/etc/omc/para5G.yaml"
|
omcFilePath := "/usr/local/etc/omc/para5G.yaml"
|
||||||
if runtime.GOOS == "windows" {
|
if runtime.GOOS == "windows" {
|
||||||
|
|||||||
@@ -648,7 +648,7 @@ func (r NeVersion) operateRun(sshClient *ssh.ConnSSH, preinput map[string]string
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 命令终止符后继续执行命令
|
// 命令终止符后继续执行命令
|
||||||
suffix := strings.HasSuffix(outputStr, "~]# ") || strings.HasSuffix(outputStr, "~$ ")
|
suffix := strings.HasSuffix(outputStr, "~]# ") || strings.LastIndex(outputStr, "~# ") != -1 || strings.HasSuffix(outputStr, "~$ ")
|
||||||
if len(cmdStrArr) > 0 && suffix {
|
if len(cmdStrArr) > 0 && suffix {
|
||||||
if firstRead {
|
if firstRead {
|
||||||
firstRead = false
|
firstRead = false
|
||||||
|
|||||||
Reference in New Issue
Block a user