WIP - update ip route tests - will be red

cloudfoundry · Jan 6, 2025 · 0644b39 · 0644b39
1 parent ae70c2a
commit 0644b39
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/code.cloudfoundry.org/silk/daemon/integration/integration_test.go b/src/code.cloudfoundry.org/silk/daemon/integration/integration_test.go
@@ -382,9 +382,9 @@ var _ = Describe("Daemon Integration", func() {
 			routes := mustSucceed("ip", "route", "list", "dev", vtepName)
 			routeFields := strings.Fields(routes)
 			Expect(routeFields).To(matchers.ContainSequence([]string{"10.255.0.0/16", "proto", "kernel", "scope", "link", "src", overlayVtepIP.String()}))
-			Expect(routeFields).To(matchers.ContainSequence([]string{remoteOverlaySubnet, "via", remoteOverlayVtepIP.String(), "src", overlayVtepIP.String()}))
-			Expect(routeFields).To(matchers.ContainSequence([]string{remoteSingleIP.String(), "via", remoteSingleIP.String(), "src", overlayVtepIP.String()}))
-			Expect(routeFields).To(matchers.ContainSequence([]string{remoteOverlaySubnetOnSecondNetwork, "via", remoteOverlayVtepIPOnSecondNetwork.String(), "src", overlayVtepIP.String()}))
+			Expect(routeFields).To(matchers.ContainSequence([]string{remoteOverlaySubnet, "via", remoteOverlayVtepIP.String()}))
+			Expect(routeFields).To(matchers.ContainSequence([]string{remoteSingleIP.String(), "via", remoteSingleIP.String()}))
+			Expect(routeFields).To(matchers.ContainSequence([]string{remoteOverlaySubnetOnSecondNetwork, "via", remoteOverlayVtepIPOnSecondNetwork.String()}))
 
 			arpEntries := mustSucceed("ip", "neigh", "list", "dev", vtepName)
 			Expect(arpEntries).To(ContainSubstring(remoteOverlayVtepIP.String() + " lladdr ee:ee:0a:ff:28:00 PERMANENT"))
@@ -433,8 +433,8 @@ var _ = Describe("Daemon Integration", func() {
 				routes := mustSucceed("ip", "route", "list", "dev", vtepName)
 				routeFields := strings.Fields(routes)
 				Expect(routeFields).To(matchers.ContainSequence([]string{"10.255.0.0/16", "proto", "kernel", "scope", "link", "src", overlayVtepIP.String()}))
-				Expect(routeFields).To(matchers.ContainSequence([]string{remoteOverlaySubnet, "via", remoteOverlayVtepIP.String(), "src", overlayVtepIP.String()}))
-				Expect(routeFields).To(matchers.ContainSequence([]string{remoteOverlaySubnetOnSecondNetwork, "via", remoteOverlayVtepIPOnSecondNetwork.String(), "src", overlayVtepIP.String()}))
+				Expect(routeFields).To(matchers.ContainSequence([]string{remoteOverlaySubnet, "via", remoteOverlayVtepIP.String()}))
+				Expect(routeFields).To(matchers.ContainSequence([]string{remoteOverlaySubnetOnSecondNetwork, "via", remoteOverlayVtepIPOnSecondNetwork.String()}))
 
 				arpEntries := mustSucceed("ip", "neigh", "list", "dev", vtepName)
 				Expect(arpEntries).To(ContainSubstring(remoteOverlayVtepIP.String() + " lladdr ee:ee:0a:ff:28:00 PERMANENT"))
@@ -466,8 +466,8 @@ var _ = Describe("Daemon Integration", func() {
 				routes = mustSucceed("ip", "route", "list", "dev", vtepName)
 				routeFields = strings.Fields(routes)
 				Expect(routeFields).To(matchers.ContainSequence([]string{"10.255.0.0/16", "proto", "kernel", "scope", "link", "src", overlayVtepIP.String()}))
-				Expect(routeFields).NotTo(matchers.ContainSequence([]string{remoteOverlaySubnet, "via", remoteOverlayVtepIP.String(), "src", overlayVtepIP.String()}))
-				Expect(routeFields).NotTo(matchers.ContainSequence([]string{remoteOverlaySubnetOnSecondNetwork, "via", remoteOverlayVtepIPOnSecondNetwork.String(), "src", overlayVtepIP.String()}))
+				Expect(routeFields).NotTo(matchers.ContainSequence([]string{remoteOverlaySubnet, "via", remoteOverlayVtepIP.String()}))
+				Expect(routeFields).NotTo(matchers.ContainSequence([]string{remoteOverlaySubnetOnSecondNetwork, "via", remoteOverlayVtepIPOnSecondNetwork.String()}))
 
 				arpEntries = mustSucceed("ip", "neigh", "list", "dev", vtepName)
 				Expect(arpEntries).NotTo(ContainSubstring(remoteOverlayVtepIP.String() + " lladdr ee:ee:0a:ff:28:00 PERMANENT"))
@@ -534,8 +534,8 @@ var _ = Describe("Daemon Integration", func() {
 				routes := mustSucceed("ip", "route", "list", "dev", vtepName)
 				routeFields := strings.Fields(routes)
 				Expect(routeFields).To(matchers.ContainSequence([]string{"10.255.0.0/16", "proto", "kernel", "scope", "link", "src", overlayVtepIP.String()}))
-				Expect(routeFields).To(matchers.ContainSequence([]string{remoteOverlaySubnet, "via", remoteOverlayVtepIP.String(), "src", overlayVtepIP.String()}))
-				Expect(routeFields).To(matchers.ContainSequence([]string{remoteOverlaySubnetOnSecondNetwork, "via", remoteOverlayVtepIPOnSecondNetwork.String(), "src", overlayVtepIP.String()}))
+				Expect(routeFields).To(matchers.ContainSequence([]string{remoteOverlaySubnet, "via", remoteOverlayVtepIP.String()}))
+				Expect(routeFields).To(matchers.ContainSequence([]string{remoteOverlaySubnetOnSecondNetwork, "via", remoteOverlayVtepIPOnSecondNetwork.String()}))
 
 				arpEntries := mustSucceed("ip", "neigh", "list", "dev", vtepName)
 				Expect(arpEntries).To(ContainSubstring(remoteOverlayVtepIP.String() + " lladdr ee:ee:0a:ff:28:00 PERMANENT"))
@@ -546,7 +546,7 @@ var _ = Describe("Daemon Integration", func() {
 				Expect(fdbEntries).To(ContainSubstring("cc:cc:cc:cc:cc:cc dst 172.17.0.9 self permanent"))
 
 				By("checking that routes do not exist for the nonroutable lease")
-				Expect(routeFields).NotTo(matchers.ContainSequence([]string{"10.123.40.0/24", "via", "10.123.40.0", "src", overlayVtepIP.String()}))
+				Expect(routeFields).NotTo(matchers.ContainSequence([]string{"10.123.40.0/24", "via", "10.123.40.0"}))
 				Expect(arpEntries).NotTo(ContainSubstring("10.123.40.0 lladdr ee:ee:0a:fe:28:00 PERMANENT"))
 				Expect(fdbEntries).NotTo(ContainSubstring("ee:ee:0a:fe:28:00 dst 172.17.0.4 self permanent"))
 			})