From 9e54ccd886845019fbe8bbe79bc6d441e6b91d67 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Wed, 17 Jan 2024 14:40:48 +0800
Subject: [PATCH] fix: dpkg software issue

---
 config/etc/default/restconf.yaml | 2 ++
 features/cm/software.go          | 8 ++++++--
 misc/spawndpkg.sh                | 8 ++++----
 restagent/config/config.go       | 1 +
 restagent/etc/restconf.yaml      | 2 ++
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/config/etc/default/restconf.yaml b/config/etc/default/restconf.yaml
index 1a9a2cf3..923dd38e 100644
--- a/config/etc/default/restconf.yaml
+++ b/config/etc/default/restconf.yaml
@@ -89,6 +89,8 @@ ne:
   etcListDefault: '{*.yaml,*.conf,*.cfg}'
   # true/false to overwrite config file when dpkg ne software 
   dpkgOverwrite: false
+  # dpkg timeout (second)
+  dpkgTimeout: 180
 
 # chk2ne: true/false, if put OmcNeConfig parameters to NE
 omc:
diff --git a/features/cm/software.go b/features/cm/software.go
index b52a7e34..3354c9fe 100644
--- a/features/cm/software.go
+++ b/features/cm/software.go
@@ -710,11 +710,15 @@ func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) {
 				return
 			}
 			var inputStr string = "n"
+			var timeout int = 180
 			if config.GetYamlConfig().NE.DpkgOverwrite {
 				inputStr = "y"
 			}
-			dpkgCmd := fmt.Sprintf("sudo %s/spawndpkg.sh %s '%s'",
-				config.GetYamlConfig().NE.ScpDir, inputStr, filePath)
+			if config.GetYamlConfig().NE.DpkgTimeout != 0 {
+				timeout = config.GetYamlConfig().NE.DpkgTimeout
+			}
+			dpkgCmd := fmt.Sprintf("sudo %s/spawndpkg.sh %d %s '%s'",
+				config.GetYamlConfig().NE.ScpDir, timeout, inputStr, filePath)
 			err = RunSSHCmd(sshHost, dpkgCmd)
 			if err != nil {
 				log.Errorf("Faile to execute dpkg command: %s, error: %v", dpkgCmd, err)
diff --git a/misc/spawndpkg.sh b/misc/spawndpkg.sh
index 238b7df3..ed004c50 100644
--- a/misc/spawndpkg.sh
+++ b/misc/spawndpkg.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-    expect <<EOF
-      set timeout 10
-      spawn dpkg -i --force-all ${2}
+expect <<EOF
+      set timeout ${1}
+      spawn dpkg -i --force-all ${3}
       expect {
-        "y/n" { send "${1}\n";exp_continue }
+        "y/n" { send "${2}\n";exp_continue }
       }
 EOF
\ No newline at end of file
diff --git a/restagent/config/config.go b/restagent/config/config.go
index 22ee7d27..7dcd0c9c 100644
--- a/restagent/config/config.go
+++ b/restagent/config/config.go
@@ -124,6 +124,7 @@ type YamlConfig struct {
 		EtcListIMS     string `yaml:"etcListIMS"`
 		EtcListDefault string `yaml:"etcListDefault"`
 		DpkgOverwrite  bool   `yaml:"dpkgOverwrite"`
+		DpkgTimeout    int    `yaml:"dpkgTimeout"`
 	} `yaml:"ne"`
 
 	Auth struct {
diff --git a/restagent/etc/restconf.yaml b/restagent/etc/restconf.yaml
index de5e53a3..4d42455e 100644
--- a/restagent/etc/restconf.yaml
+++ b/restagent/etc/restconf.yaml
@@ -89,6 +89,8 @@ ne:
   etcListDefault: '{*.yaml,*.conf,*.cfg}'
   # true/false to overwrite config file when dpkg ne software 
   dpkgOverwrite: false
+  # dpkg timeout (second)
+  dpkgTimeout: 180
 
 # chk2ne: true/false, if put OmcNeConfig parameters to NE
 omc: