Fix IPv6 e2e test caused by image update #6045
Conversation
|
/test-all |
test/e2e/util.go
Outdated
| // getURL("1.2.3.4", "8080") == "http://1.2.3.4:8080" | ||
| // getURL("1.2.3.4", "8080", "clientip") == "http://1.2.3.4:8080/clientip" | ||
| // getURL("fd74:ca9b:172::b4e", "8080") == "http://[fd74:ca9b:172::b4e]:8080" | ||
| func getURL(ip string, args ...string) string { |
There was a problem hiding this comment.
I think a more specific name such as getHttpURLFromIP may be better
There was a problem hiding this comment.
renamed to getHTTPURLFromIPPort
test/e2e/util.go
Outdated
| @@ -56,3 +56,21 @@ func IPFamily(ip string) string { | |||
| return "" | |||
| } | |||
| } | |||
|
|
|||
| // getURL returns a HTTP url based on the IP and the addition port and path if provided. | |||
There was a problem hiding this comment.
I think you meant "additional" and not "addition"?
test/e2e/util.go
Outdated
| func getURL(ip string, args ...string) string { | ||
| port := "80" | ||
| if len(args) > 0 { | ||
| port = args[0] |
There was a problem hiding this comment.
Maybe add a comment to highlight that the port need be the first argument if multiple args are provided.
There was a problem hiding this comment.
made it an explicit argument
test/e2e/flowaggregator_test.go
Outdated
| } | ||
| cmd := []string{"curl", getURL(testFlow1.dstIP, fmt.Sprint(serverPodPort))} |
There was a problem hiding this comment.
Not sure if the port argument is always int or not, if it's always int, maybe add a new parameter to getURL as the second argument, and then we don't have to call the format converter like fmt.Sprint(serverPodPort) every time when there is a port, which can be done inside of the getURL.
wget in toolbox image expects the protocol to be specified when IPv6 address is used in the url, otherwise it would use ftp protocol. This patch fixes it and unifies how we get url from IP, port and path. Signed-off-by: Quan Tian <[email protected]>
|
/test-e2e |
wget in toolbox image expects the protocol to be specified when IPv6 address is used in the url, otherwise it would use ftp protocol. This patch fixes it and unifies how we get url from IP, port and path.