diff --git a/features/cm/software.go b/features/cm/software.go index d929d2dc..9614e1f0 100644 --- a/features/cm/software.go +++ b/features/cm/software.go @@ -698,8 +698,8 @@ func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) { return } - runCmd := fmt.Sprintf("sudo %s/actpkg.sh '%s'", - config.GetYamlConfig().NE.ScpDir, filePath) + runCmd := fmt.Sprintf("sudo %s/actpkg.sh '%s' %s", + config.GetYamlConfig().NE.ScpDir, filePath, neTypeUpper) if neTypeLower == "omc" { idNeVersion, _ := strconv.Atoi((*neVersion)[0]["id"]) neVersionData := dborm.NeVersion{ @@ -712,7 +712,7 @@ func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) { services.ResponseInternalServerError500ProcessError(w, err) return } - log.Debug("Run here") + services.ResponseStatusOK204NoContent(w) go RunSSHCmd(sshHost, runCmd) return diff --git a/misc/actpkg.sh b/misc/actpkg.sh index a0cbb890..9faf4f91 100644 --- a/misc/actpkg.sh +++ b/misc/actpkg.sh @@ -1,10 +1,14 @@ #!/bin/bash filename="$1" +neType="$2" extension=$(basename "${1}" | awk -F . '{print $NF}') case "${extension}" in deb) + if [ neType == "OMC" ]; then + systemctl stop restagent.service + fi expect <