From a9d74f75b993644646b83c7678a8617a72b06e14 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Tue, 19 Sep 2023 16:44:44 +0800
Subject: [PATCH] d

---
 config/param/udm_param_config.yaml |  8 ++++----
 features/cm/software.go            | 22 +++++++++++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/config/param/udm_param_config.yaml b/config/param/udm_param_config.yaml
index ebe6eb72..8c7e08a6 100644
--- a/config/param/udm_param_config.yaml
+++ b/config/param/udm_param_config.yaml
@@ -525,11 +525,11 @@ udm:
         display: "Context Identifier"
         comment: ""
       - name: "vplmnDynamicAddressAllowed"
-        type: "enum"
-        value: '0'
+        type: "bool"
+        value: 'true'
         access: "read-write"
-        filter: "{\"0\":\"Not Allowed\",\"1\":\"Allowed\"}"
-        display: "Vplmn Dynamic Address Allowed"
+        filter: 'false;true;'
+        display: "enable"
         comment: ""
       - name: "pdnGWAllocationType"
         type: "enum"
diff --git a/features/cm/software.go b/features/cm/software.go
index 0838a1ee..6f49377b 100644
--- a/features/cm/software.go
+++ b/features/cm/software.go
@@ -539,12 +539,12 @@ func DistributeSoftwareToNF(w http.ResponseWriter, r *http.Request) {
 	log.Debug("neVersion:", neVersion)
 
 	sshHost := fmt.Sprintf("%s@%s", config.GetYamlConfig().NE.User, neInfo.Ip)
-	mkdirCmd := fmt.Sprintf("mkdir -p %s/software/%s", config.GetYamlConfig().NE.OmcDir, neTypeLower)
+	mkdirCmd := fmt.Sprintf("sudo mkdir -p %s/software/%s", config.GetYamlConfig().NE.OmcDir, neTypeLower)
 	cmd := exec.Command("ssh", sshHost, mkdirCmd)
 	out, err := cmd.CombinedOutput()
 	log.Tracef("Exec output: %v", string(out))
 	if err != nil {
-		log.Error("Faile to exec cmd:", err)
+		log.Error("Faile to mkdir:", err)
 		services.ResponseInternalServerError500ProcessError(w, err)
 		return
 	}
@@ -552,9 +552,10 @@ func DistributeSoftwareToNF(w http.ResponseWriter, r *http.Request) {
 	fileName := (*neSoftware)[0]["file_name"]
 	path := (*neSoftware)[0]["path"]
 	srcFile := fmt.Sprintf("%s/%s", path, fileName)
-	dstDir := fmt.Sprintf("%s@%s:%s/software/%s", config.GetYamlConfig().NE.User,
-		neInfo.Ip, config.GetYamlConfig().NE.OmcDir, neTypeLower)
-	cmd = exec.Command("scp", "-r", srcFile, dstDir)
+
+	scpDir := fmt.Sprintf("%s@%s:%s", config.GetYamlConfig().NE.User,
+		neInfo.Ip, config.GetYamlConfig().NE.ScpDir)
+	cmd = exec.Command("scp", "-r", srcFile, scpDir)
 	out, err = cmd.CombinedOutput()
 	log.Tracef("Exec output: %v", string(out))
 	if err != nil {
@@ -562,6 +563,17 @@ func DistributeSoftwareToNF(w http.ResponseWriter, r *http.Request) {
 		services.ResponseInternalServerError500ProcessError(w, err)
 		return
 	}
+	neFilePath := config.GetYamlConfig().NE.ScpDir + "/" + fileName
+	cpCmd := fmt.Sprintf("sudo cp -f %s %s/software/%s", neFilePath,
+		config.GetYamlConfig().NE.OmcDir, neTypeLower)
+	cmd = exec.Command("ssh", sshHost, cpCmd)
+	out, err = cmd.CombinedOutput()
+	log.Tracef("Exec output: %v", string(out))
+	if err != nil {
+		log.Error("Faile to execute cp command:", err)
+		services.ResponseInternalServerError500ProcessError(w, err)
+		return
+	}
 
 	if len(*neVersion) == 0 {
 		neVersionData := dborm.NeVersion{