From 2efd64d928d5a4499f73c0aa1e6c8933c685db44 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Wed, 17 Jan 2024 17:24:39 +0800 Subject: [PATCH] fix: active pkg issue --- features/cm/software.go | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/features/cm/software.go b/features/cm/software.go index 0de5921c..6ee34d4c 100644 --- a/features/cm/software.go +++ b/features/cm/software.go @@ -701,7 +701,18 @@ func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) { runCmd := fmt.Sprintf("sudo %s/actpkg.sh '%s'", config.GetYamlConfig().NE.ScpDir, filePath) if neTypeLower == "omc" { - services.ResponseStatusOK201Accepted(w) + idNeVersion, _ := strconv.Atoi((*neVersion)[0]["id"]) + neVersionData := dborm.NeVersion{ + Status: SoftwareStatusActive, + } + + _, err = dborm.XormUpdateTableById(idNeVersion, "ne_version", neVersionData) + if err != nil { + log.Error("Faile to UpdateTableById:", err) + services.ResponseInternalServerError500ProcessError(w, err) + return + } + services.ResponseStatusOK204NoContent(w) RunSSHCmd(sshHost, runCmd) return } @@ -889,7 +900,24 @@ func RollBackSoftwareToNF(w http.ResponseWriter, r *http.Request) { runCmd := fmt.Sprintf("sudo %s/rbkpkg.sh '%s'", config.GetYamlConfig().NE.ScpDir, filePath) if neTypeLower == "omc" { - services.ResponseStatusOK201Accepted(w) + idNeVersion, _ := strconv.Atoi((*neVersion)[0]["id"]) + neVersionData := dborm.NeVersion{ + Version: (*neVersion)[0]["pre_version"], + FilePath: (*neVersion)[0]["pre_file"], + PreVersion: "-", + PreFile: "-", + NewVersion: (*neVersion)[0]["version"], + NewFile: (*neVersion)[0]["file_path"], + Status: SoftwareStatusActive, + } + + _, err = dborm.XormUpdateTableById(idNeVersion, "ne_version", neVersionData) + if err != nil { + log.Error("Faile to UpdateTableById:", err) + services.ResponseInternalServerError500ProcessError(w, err) + return + } + services.ResponseStatusOK204NoContent(w) RunSSHCmd(sshHost, runCmd) return }