Skip to content

test fix for isolated env #3594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+29 −14
Open

test fix for isolated env #3594

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8e86415
test fix for isolated env
rajguptavm Sep 19, 2025
a7a799f
log added
rajguptavm Sep 22, 2025
3882382
log2 added
rajguptavm Sep 22, 2025
49d378b
log3 added
rajguptavm Sep 22, 2025
fe66b47
log4 added
rajguptavm Sep 22, 2025
59e5cc7
regex fix 1
rajguptavm Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 29 additions & 14 deletions tests/e2e/config_secret_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"fmt"
"os/exec"
"regexp"
"strings"

"github.com/onsi/ginkgo/v2"
Expand Down Expand Up @@ -358,21 +359,34 @@ func getClusterNames(masterIp string, sshClientConfig *ssh.ClientConfig,
cluster, masterIp, err)
}
clusDetails = nil
if !strings.Contains(clusterResult.Stdout, "10.") {
if clusterResult.Stdout != "" {
clusListTemp := strings.Split(clusterResult.Stdout, "\n")
clusDetails = append(clusDetails, clusListTemp...)
// ipRegex := regexp.MustCompile(`\b(?:\d{1,3}\.){3}\d{1,3}\b`)
ipRegex := regexp.MustCompile(`\b(?:\d{1,3}\.){3}\d{1,3}$`)
matches := ipRegex.FindAllString(clusterResult.Stdout, -1)
framework.Logf("Matched IPs: %v", matches)
// if !ipRegex.MatchString(clusterResult.Stdout) {
// // framework.Logf("Fetching cluster details using regex")
// if clusterResult.Stdout != "" {
// clusListTemp := strings.Split(clusterResult.Stdout, "\n")
// clusDetails = append(clusDetails, clusListTemp...)
// }
// for i := 0; i < len(clusDetails)-1; i++ {
// clusterList = append(clusterList, clusDetails[i])
// }
// clusDetails = nil
// } else {
// for i := 0; i < len(clusterNames)-1; i++ {
// clusterList = append(clusterList, clusterNames[i])
// }
// clusDetails = nil
// }
clusListTemp := strings.Split(clusterResult.Stdout, "\n")
for _, clusterVal := range clusListTemp {
if ipRegex.MatchString(clusterVal) {
framework.Logf("Matching IPs found")
clusterList = append(clusterList, clusterVal)
}
for i := 0; i < len(clusDetails)-1; i++ {
clusterList = append(clusterList, clusDetails[i])
}
clusDetails = nil
} else {
for i := 0; i < len(clusterNames)-1; i++ {
clusterList = append(clusterList, clusterNames[i])
}
clusDetails = nil
}

}
return clusterList, nil
}
Expand All @@ -382,7 +396,8 @@ func getEsxiHostNames(masterIp string, sshClientConfig *ssh.ClientConfig, cluste
var hostsList, hostList []string
framework.Logf("Fetching ESXi host details")
for i := 0; i < len(cluster); i++ {
hosts := govcLoginCmd() + "govc ls " + cluster[i] + " " + " | grep 10."
// hosts := govcLoginCmd() + "govc ls " + cluster[i] + " " + " | grep 10."
hosts := govcLoginCmd() + "govc ls " + cluster[i] + " | grep -Eo '[0-9]{1,3}(\\.[0-9]{1,3}){3}'"
hostsResult, err := sshExec(sshClientConfig, masterIp, hosts)
if err != nil && hostsResult.Code != 0 {
fssh.LogResult(hostsResult)
Expand Down