diff --git a/features/cm/software.go b/features/cm/software.go index 6f401e33..b52a7e34 100644 --- a/features/cm/software.go +++ b/features/cm/software.go @@ -764,7 +764,7 @@ func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) { out, err := cmd.CombinedOutput() log.Debugf("Exec output: %v", string(out)) if err != nil { - log.Error("Faile to execute ssh sudo systemctl command:", err) + log.Error("Faile to execute ssh command: %s, error: %v", restartCmd, err) services.ResponseInternalServerError500ProcessError(w, err) return } @@ -864,20 +864,33 @@ func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) { if fileType == 1 { rpmCmd := fmt.Sprintf("sudo rpm -Uvh --oldpackage '%s'", filePath) cmd := exec.Command("ssh", sshHost, rpmCmd) - out, err := cmd.CombinedOutput() - log.Debugf("Exec output: %v", string(out)) + _, err := cmd.CombinedOutput() if err != nil { log.Error("Faile to execute rpm command:", err) services.ResponseInternalServerError500ProcessError(w, err) return } } else if fileType == 2 { - dpkgCmd := fmt.Sprintf("sudo dpkg -i --force-all '%s'", filePath) - cmd := exec.Command("ssh", sshHost, dpkgCmd) - out, err := cmd.CombinedOutput() - log.Debugf("Exec output: %v", string(out)) + srcFile := fmt.Sprintf("%s/spawndpkg.sh", config.GetYamlConfig().OMC.BinDir) + + scpDir := fmt.Sprintf("%s@%s:%s", config.GetYamlConfig().NE.User, + neInfo.Ip, config.GetYamlConfig().NE.ScpDir) + cmd := exec.Command("scp", "-r", srcFile, scpDir) + _, err := cmd.CombinedOutput() if err != nil { - log.Error("Faile to execute dpkg command:", err) + log.Errorf("Faile to scp NF: neType=%s, neId=%s, ip=%s", neType, neId, neInfo.Ip) + services.ResponseInternalServerError500ProcessError(w, err) + return + } + var inputStr string = "n" + if config.GetYamlConfig().NE.DpkgOverwrite { + inputStr = "y" + } + dpkgCmd := fmt.Sprintf("sudo %s/spawndpkg.sh %s '%s'", + config.GetYamlConfig().NE.ScpDir, inputStr, filePath) + err = RunSSHCmd(sshHost, dpkgCmd) + if err != nil { + log.Errorf("Faile to execute dpkg command: %s, error: %v", dpkgCmd, err) services.ResponseInternalServerError500ProcessError(w, err) return } @@ -892,7 +905,7 @@ func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) { restartCmd := fmt.Sprintf("sudo %s/bin/omcsvc.sh restart", config.GetYamlConfig().NE.OmcDir) cmd := exec.Command("ssh", sshHost, restartCmd) out, err := cmd.CombinedOutput() - log.Debugf("Exec output: %v", string(out)) + log.Tracef("Exec output: %v", string(out)) if err != nil { log.Error("Faile to execute ssh restart omc:", err) services.ResponseInternalServerError500ProcessError(w, err) @@ -902,9 +915,9 @@ func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) { restartCmd := "sudo ims-stop && sudo ims-start" cmd := exec.Command("ssh", sshHost, restartCmd) out, err := cmd.CombinedOutput() - log.Debugf("Exec output: %v", string(out)) + log.Tracef("Exec output: %v", string(out)) if err != nil { - log.Error("Faile to execute ssh sudo systemctl command:", err) + log.Error("Faile to execute ssh command: %s, error: %v", restartCmd, err) services.ResponseInternalServerError500ProcessError(w, err) return } @@ -912,7 +925,7 @@ func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) { restartCmd := fmt.Sprintf("sudo systemctl restart %s.service", neTypeLower) cmd := exec.Command("ssh", sshHost, restartCmd) out, err := cmd.CombinedOutput() - log.Debugf("Exec output: %v", string(out)) + log.Tracef("Exec output: %v", string(out)) if err != nil { log.Error("Faile to execute ssh sudo systemctl command:", err) services.ResponseInternalServerError500ProcessError(w, err)