Merge pull request projectcalico#8083 from tomastigera/tomas-ipv6-fv-…

…infra fv infra for runnign full ipv6 tests
tomastigera · Oct 6, 2023 · 31b649d · 31b649d
2 parents 5fa2b23 + c2f3390
commit 31b649d
Show file tree

Hide file tree

Showing 13 changed files with 251 additions and 77 deletions.
diff --git a/felix/fv/connectivity/conncheck.go b/felix/fv/connectivity/conncheck.go
@@ -234,7 +234,12 @@ func (c *Checker) ActualConnectivity(isARetry bool) ([]*Result, []string) {
 
 			if res != nil {
 				if c.CheckSNAT {
-					srcIP := strings.Split(res.LastResponse.SourceAddr, ":")[0]
+					var srcIP string
+					if res.LastResponse.SourceAddr != "" && res.LastResponse.SourceAddr[0] == '[' {
+						srcIP = strings.Split(res.LastResponse.SourceAddr[1:], "]")[0]
+					} else {
+						srcIP = strings.Split(res.LastResponse.SourceAddr, ":")[0]
+					}
 					pretty[i] += " (from " + srcIP + ")"
 				}
 				if res.ClientMTU.Start != 0 {
@@ -439,7 +444,11 @@ type Response struct {
 }
 
 func (r *Response) SourceIP() string {
-	return strings.Split(r.SourceAddr, ":")[0]
+	if r.SourceAddr[0] != '[' {
+		return strings.Split(r.SourceAddr, ":")[0]
+	}
+
+	return strings.Split(r.SourceAddr[1:], "]")[0]
 }
 
 type ConnectionTarget interface {

diff --git a/felix/fv/containers/containers.go b/felix/fv/containers/containers.go
@@ -698,6 +698,9 @@ func (c *Container) SourceName() string {
 
 func (c *Container) SourceIPs() []string {
 	ips := []string{c.IP}
+	if c.IPv6 != "" {
+		ips = append(ips, c.IPv6)
+	}
 	ips = append(ips, c.ExtraSourceIPs...)
 	return ips
 }

diff --git a/felix/fv/infrastructure/datastore_describe.go b/felix/fv/infrastructure/datastore_describe.go
@@ -21,7 +21,7 @@ import (
 	"github.com/projectcalico/calico/libcalico-go/lib/apiconfig"
 )
 
-type InfraFactory func() DatastoreInfra
+type InfraFactory func(...CreateOption) DatastoreInfra
 
 // DatastoreDescribe is a replacement for ginkgo.Describe which invokes Describe
 // multiple times for one or more different datastore drivers - passing in the

diff --git a/felix/fv/infrastructure/felix.go b/felix/fv/infrastructure/felix.go
@@ -65,6 +65,8 @@ type Felix struct {
 	startupDelayed bool
 	restartDelayed bool
 	Workloads      []workload
+
+	TopologyOptions TopologyOptions
 }
 
 type workload interface {
@@ -223,8 +225,9 @@ func RunFelix(infra DatastoreInfra, id int, options TopologyOptions) *Felix {
 		"-P", "FORWARD", "DROP")
 
 	return &Felix{
-		Container:      c,
-		startupDelayed: options.DelayFelixStart,
+		Container:       c,
+		startupDelayed:  options.DelayFelixStart,
+		TopologyOptions: options,
 	}
 }
 

diff --git a/felix/fv/infrastructure/infra_etcd.go b/felix/fv/infrastructure/infra_etcd.go
@@ -42,7 +42,7 @@ type EtcdDatastoreInfra struct {
 	BadEndpoint string
 }
 
-func createEtcdDatastoreInfra() DatastoreInfra {
+func createEtcdDatastoreInfra(opts ...CreateOption) DatastoreInfra {
 	infra, err := GetEtcdDatastoreInfra()
 	Expect(err).NotTo(HaveOccurred())
 	return infra