Skip to content

Commit

Permalink
Revert PRs-> 293 and 292 (#314)
Browse files Browse the repository at this point in the history 
* Revert "Fix for PR->292. D5 interface is used for primary networking. (#293)"

This reverts commit f01e94e.

* Revert "Change to replace manual step(used by redhat, where ipu_port1_setup.sh script is used). (#292)"

This reverts commit 9ebacef.
  • Loading branch information
@sudhar-krishnakumar
sudhar-krishnakumar authored Jan 7, 2025
1 parent 5ee7119 commit a489035
Showing 1 changed file with 2 additions and 129 deletions.
131 changes: 2 additions & 129 deletions ipu-plugin/pkg/ipuplugin/lifecycleservice.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,13 +495,6 @@ func setBaseMacAddr() (string, error) {
return macAddress, nil
}

/*
Updates files below on IMC, and does IMC reboot.
1. Copy P4 package from container to IMC
2. Update load_custom_pkg.sh
3. Create post_init_app.sh
4. Create uuid file.
*/
func (s *SSHHandlerImpl) sshFunc() error {
config := &ssh.ClientConfig{
User: "root",
Expand Down Expand Up @@ -592,38 +585,6 @@ func (s *SSHHandlerImpl) sshFunc() error {
return fmt.Errorf("failed to sync load_custom_pkg.sh: %s", err)
}

err = sftpClient.Chmod(loadCustomPkgFilePath, 0755)
if err != nil {
log.Errorf("failed to chmod load_custom_pkg.sh file: %s", err)
return fmt.Errorf("failed to chmod load_custom_pkg.sh file: %s", err)
}

//Create post_init_app.sh
postInitAppFileStr := postInitAppScript()
postInitRemoteFilePath := "/work/scripts/post_init_app.sh"
postInitFile, err := sftpClient.Create(postInitRemoteFilePath)
if err != nil {
log.Errorf("failed to create post_init_app.sh file: %s", err)
return fmt.Errorf("failed to create post_init_app.sh file: %s", err)
}
defer postInitFile.Close()

_, err = postInitFile.Write([]byte(postInitAppFileStr))
if err != nil {
return fmt.Errorf("failed to write to post_init_app.sh file: %s", err)
}

err = postInitFile.Sync()
if err != nil {
return fmt.Errorf("failed to sync post_init_app.sh file: %s", err)
}

err = sftpClient.Chmod(postInitRemoteFilePath, 0755)
if err != nil {
log.Errorf("failed to chmod post_init_app.sh file: %s", err)
return fmt.Errorf("failed to chmod post_init_app.sh file: %s", err)
}

uuidFilePath := "/work/uuid"
uuidFile, err := sftpClient.Create(uuidFilePath)
if err != nil {
Expand Down Expand Up @@ -681,57 +642,6 @@ func countAPFDevices() int {
return len(pfList)
}

func postInitAppScript() string {

postInitAppScriptStr := `PORT_SETUP_SCRIPT=/work/scripts/port-setup.sh
PORT_SETUP_LOG=/work/port-setup.log
pkill -9 $(basename ${PORT_SETUP_SCRIPT})
/bin/rm -f ${PORT_SETUP_SCRIPT} ${PORT_SETUP_LOG}
#To ensure files get removed.
sync
cat<<PORT_CONFIG_EOF > ${PORT_SETUP_SCRIPT}
#!/bin/bash
set -x
IDPF_VPORT_NAME="enp0s1f0d5"
ACC_VPORT_ID=0x5
retry=0
while true ; do
sleep 2
cli_entry=(\$(cli_client -qc | grep "fn_id: 0x4 .* vport_id \${ACC_VPORT_ID}" | sed 's/: / /g' | sed 's/addr //g'))
if [ \${#cli_entry[@]} -gt 1 ] ; then
for (( id=0 ; id<\${#cli_entry[@]} ; id+=2 )) ; do
declare "\${cli_entry[id]}"="\${cli_entry[\$((id+1))]}"
#echo "\${cli_entry[id]}"="\${cli_entry[\$((id+1))]}"
done
if [ X\${is_created} == X"yes" ] && [ X\${is_enabled} == X"yes" ] ; then
IDPF_VPORT_VSI_HEX=\${vsi_id}
VSI_GROUP_INIT=\$(printf "0x%x" \$((0x8000050000000000 + IDPF_VPORT_VSI_HEX)))
VSI_GROUP_WRITE=\$(printf "0x%x" \$((0xA000050000000000 + IDPF_VPORT_VSI_HEX)))
echo "#Add to VSI Group 1 : \${IDPF_VPORT_NAME} [vsi: \${IDPF_VPORT_VSI_HEX}]"
devmem 0x20292002a0 64 \${VSI_GROUP_INIT}
devmem 0x2029200388 64 0x1
devmem 0x20292002a0 64 \${VSI_GROUP_WRITE}
exit 0
fi
else
retry=\$((retry+1))
echo "RETRY: \${retry} : #Add to VSI Group 1 : \${IDPF_VPORT_NAME} .. "
fi
done
PORT_CONFIG_EOF
/usr/bin/chmod a+x ${PORT_SETUP_SCRIPT}
/usr/bin/nohup ${PORT_SETUP_SCRIPT} 0>&- &> ${PORT_SETUP_LOG} &`

return postInitAppScriptStr
}

func genLoadCustomPkgFile(macAddress string) string {

p4PkgName := os.Getenv("P4_NAME") + ".pkg"
Expand Down Expand Up @@ -766,12 +676,9 @@ fi
/*
IMC reboot needed for following cases:
Note: Changes to load_custom_pkg.sh or post_init_app.sh is managed
thro ipu-plugin->using genLoadCustomPkgFile and postInitAppScript.
1. First time provisioning of IPU system(where MAC gets set in node policy)
2. Upgrade-for any update to P4 package.
3. Upgrade-for node policy. Other changes in node policy thro load_custom_pkg.sh.
4. Check if file-> post_init_app.sh exists.
Returns-> bool(returns false, if IMC reboot is required), string->for any error or success string.
*/
func skipIMCReboot() (bool, string) {
Expand Down Expand Up @@ -808,7 +715,7 @@ func skipIMCReboot() (bool, string) {
p4pkgMatch := false
uuidFileExists := false
lcpkgFileMatch := false
piaFileMatch := false

outputStr := strings.TrimSuffix(string(outputBytes), "\n")

if outputStr == "File does not exist" {
Expand Down Expand Up @@ -898,41 +805,7 @@ func skipIMCReboot() (bool, string) {
return false, "lcpkgFileMatch mismatch"
}

postInitAppFile := postInitAppScript()
postInitAppFileHash := md5.Sum([]byte(postInitAppFile))
postInitAppFileHashStr := hex.EncodeToString(postInitAppFileHash[:])

postInitRemoteFilePath := "/work/scripts/post_init_app.sh"
imcPostInitFile, err := sftpClient.Open(postInitRemoteFilePath)
if err != nil {
log.Errorf("failed to open post_init_app.sh file: %s", err)
return false, fmt.Sprintf("failed to open post_init_app.sh file: %s", err)
}
log.Infof("post_init_app.sh file exists")
defer imcPostInitFile.Close()

imcPostInitFileBytes, err := io.ReadAll(imcPostInitFile)
if err != nil {
log.Errorf("failed to read post_init_app.sh: %s", err)
return false, fmt.Sprintf("failed to read post_init_app.sh: %s", err)
}

imcPostInitFileHash := md5.Sum(imcPostInitFileBytes)
imcPostInitFileHashStr := hex.EncodeToString(imcPostInitFileHash[:])

if postInitAppFileHashStr != imcPostInitFileHashStr {
log.Infof("post_init_app.sh md5 mismatch, generated->%v, on IMC->%v", postInitAppFileHashStr, imcPostInitFileHashStr)
} else {
log.Infof("post_init_app.sh md5 match, generated->%v, on IMC->%v", postInitAppFileHashStr, imcPostInitFileHashStr)
piaFileMatch = true
}

if !piaFileMatch {
return false, "piaFileMatch mismatch"
}

log.Infof("uuidFileExists->%v, p4pkgMatch->%v, lcpkgFileMatch->%v, piaFileMatch->%v",
uuidFileExists, p4pkgMatch, lcpkgFileMatch, piaFileMatch)
log.Infof("uuidFileExists->%v, p4pkgMatch->%v, lcpkgFileMatch->%v", uuidFileExists, p4pkgMatch, lcpkgFileMatch)
return true, fmt.Sprintf("checks pass, imc reboot not required")

}
Expand Down

0 comments on commit a489035

Please sign in to comment.