OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: dpkg software issue

Browse Source
This commit is contained in:
simonzhangsz
2024-01-17 14:40:48 +08:00
parent 8eb6430ae3
commit 9e54ccd886
5 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/etc/default/restconf.yaml
View File

@@ -89,6 +89,8 @@ ne:
etcListDefault: '{*.yaml,*.conf,*.cfg}' etcListDefault: '{*.yaml,*.conf,*.cfg}'
# true/false to overwrite config file when dpkg ne software # true/false to overwrite config file when dpkg ne software
dpkgOverwrite: false dpkgOverwrite: false
# dpkg timeout (second)
dpkgTimeout: 180
# chk2ne: true/false, if put OmcNeConfig parameters to NE # chk2ne: true/false, if put OmcNeConfig parameters to NE
omc: omc:

8
features/cm/software.go
View File

@@ -710,11 +710,15 @@ func ActiveSoftwareToNF(w http.ResponseWriter, r *http.Request) {
return return
} }
var inputStr string = "n" var inputStr string = "n"
var timeout int = 180
if config.GetYamlConfig().NE.DpkgOverwrite { if config.GetYamlConfig().NE.DpkgOverwrite {
inputStr = "y" inputStr = "y"
} }
dpkgCmd := fmt.Sprintf("sudo %s/spawndpkg.sh %s '%s'", if config.GetYamlConfig().NE.DpkgTimeout != 0 {
config.GetYamlConfig().NE.ScpDir, inputStr, filePath) 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) err = RunSSHCmd(sshHost, dpkgCmd)
if err != nil { if err != nil {
log.Errorf("Faile to execute dpkg command: %s, error: %v", dpkgCmd, err) log.Errorf("Faile to execute dpkg command: %s, error: %v", dpkgCmd, err)

8
misc/spawndpkg.sh
View File

@@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
expect <<EOF expect <<EOF
set timeout 10 set timeout ${1}
spawn dpkg -i --force-all ${2} spawn dpkg -i --force-all ${3}
expect { expect {
"y/n" { send "${1}\n";exp_continue } "y/n" { send "${2}\n";exp_continue }
} }
EOF EOF

1
restagent/config/config.go
View File

@@ -124,6 +124,7 @@ type YamlConfig struct {
EtcListIMS string `yaml:"etcListIMS"` EtcListIMS string `yaml:"etcListIMS"`
EtcListDefault string `yaml:"etcListDefault"` EtcListDefault string `yaml:"etcListDefault"`
DpkgOverwrite bool `yaml:"dpkgOverwrite"` DpkgOverwrite bool `yaml:"dpkgOverwrite"`
DpkgTimeout int `yaml:"dpkgTimeout"`
} `yaml:"ne"` } `yaml:"ne"`
Auth struct { Auth struct {

2
restagent/etc/restconf.yaml
View File

@@ -89,6 +89,8 @@ ne:
etcListDefault: '{*.yaml,*.conf,*.cfg}' etcListDefault: '{*.yaml,*.conf,*.cfg}'
# true/false to overwrite config file when dpkg ne software # true/false to overwrite config file when dpkg ne software
dpkgOverwrite: false dpkgOverwrite: false
# dpkg timeout (second)
dpkgTimeout: 180
# chk2ne: true/false, if put OmcNeConfig parameters to NE # chk2ne: true/false, if put OmcNeConfig parameters to NE
omc: omc: