[BPF] fix testing removing devices when vxlan is turned off

Author: tomastigera

felix/fv/vxlan_test.go

@@ -845,6 +845,7 @@ var _ = infrastructure.DatastoreDescribe("_BPF-SAFE_ VXLAN topology before addin
 				mtuStrV6 := "mtu 1430"
 				if BPFMode() {
 					mtuStr = "mtu 1500"
+					mtuStrV6 = "mtu 1500"
 				}
 				for _, felix := range felixes {
 					Eventually(func() string {
@@ -867,23 +868,26 @@ var _ = infrastructure.DatastoreDescribe("_BPF-SAFE_ VXLAN topology before addin
 				_, err := client.FelixConfigurations().Create(context.Background(), felixConfig, options.SetOptions{})
 				Expect(err).NotTo(HaveOccurred())
 
-				// Expect the ipv4 VXLAN device to be deleted.
-				for _, felix := range felixes {
-					Eventually(func() string {
-						out, _ := felix.ExecOutput("ip", "-d", "link", "show", "vxlan.calico")
-						return out
-					}, "60s", "500ms").ShouldNot(ContainSubstring(mtuStr))
-					// IPv6 ignores the VXLAN enabled flag and must be disabled at the pool level. As such the ipv6
-					// interfaces should still exist at this point
-					if !BPFMode() && enableIPv6 {
+				if !BPFMode() || !enableIPv6 {
+					// Expect the ipv4 VXLAN device to be deleted. In BPFMode
+					// the same device is used for V6 as well
+					for _, felix := range felixes {
 						Eventually(func() string {
-							out, _ := felix.ExecOutput("ip", "-d", "link", "show", "vxlan-v6.calico")
+							out, _ := felix.ExecOutput("ip", "-d", "link", "show", "vxlan.calico")
 							return out
-						}, "60s", "500ms").Should(ContainSubstring(mtuStrV6))
+						}, "60s", "500ms").ShouldNot(ContainSubstring(mtuStr))
+						// IPv6 ignores the VXLAN enabled flag and must be disabled at the pool level. As such the ipv6
+						// interfaces should still exist at this point
+						if enableIPv6 {
+							Eventually(func() string {
+								out, _ := felix.ExecOutput("ip", "-d", "link", "show", "vxlan-v6.calico")
+								return out
+							}, "60s", "500ms").Should(ContainSubstring(mtuStrV6))
+						}
 					}
 				}
 
-				if !BPFMode() && enableIPv6 {
+				if enableIPv6 {
 					ip6pool, err := client.IPPools().Get(context.Background(), infrastructure.DefaultIPv6PoolName, options.GetOptions{})
 					Expect(err).NotTo(HaveOccurred())
 					ip6pool.Spec.VXLANMode = "Never"
@@ -893,6 +897,10 @@ var _ = infrastructure.DatastoreDescribe("_BPF-SAFE_ VXLAN topology before addin
 					// Expect the ipv6 VXLAN device to be deleted.
 					for _, felix := range felixes {
 						Eventually(func() string {
+							if BPFMode() {
+								out, _ := felix.ExecOutput("ip", "-d", "link", "show", "vxlan.calico")
+								return out
+							}
 							out, _ := felix.ExecOutput("ip", "-d", "link", "show", "vxlan-v6.calico")
 							return out
 						}, "60s", "500ms").ShouldNot(ContainSubstring(mtuStrV6))