Fix moving route ip to bridge test

- Upgrade kubevirtci, has some fixes for tun/tap qemu interfaces - Fix vlans check It should fix the moving defout route ip to bridge test Signed-off-by: Quique Llorente <[email protected]>
nmstate · Sep 20, 2019 · 94efad3 · 94efad3
1 parent b3f0c02
commit 94efad3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/hack/install-kubevirtci.sh b/hack/install-kubevirtci.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 organization=kubevirt
-commit="1c2922cd9ebaabf7006dc68aa8df70ad84d96d4b"
+commit="db8c24bf830bb927f01829e6c9f083627fe6b832"
 
 script_dir=$(dirname "$(readlink -f "$0")")
 kubevirtci_dir=kubevirtci

diff --git a/test/e2e/default_bridged_network_test.go b/test/e2e/default_bridged_network_test.go
@@ -48,7 +48,7 @@ var _ = Describe("NodeNetworkConfigurationPolicy default bridged network", func(
 `)
 	// FIXME: This is a pending spec since we have to discover why the
 	//        cluster never goes back at kubevirtci provider
-	XContext("when there is a default interface with dynamic address", func() {
+	Context("when there is a default interface with dynamic address", func() {
 		addressByNode := map[string]string{}
 		BeforeEach(func() {
 			By("Check eth0 is the default route interface and has dynamic address")
@@ -61,7 +61,8 @@ var _ = Describe("NodeNetworkConfigurationPolicy default bridged network", func(
 			for _, node := range nodes {
 				address := ""
 				Eventually(func() string {
-					return ipv4Address(node, "eth0")
+					address = ipv4Address(node, "eth0")
+					return address
 				}, 15*time.Second, 1*time.Second).ShouldNot(BeEmpty(), "Interface eth0 has no ipv4 address")
 				addressByNode[node] = address
 			}
@@ -70,6 +71,9 @@ var _ = Describe("NodeNetworkConfigurationPolicy default bridged network", func(
 			By("Removing bridge and configuring eth0 with dhcp")
 			setDesiredStateWithPolicy("default-network", resetDefaultInterface)
 
+			By("Waiting until the node becomes ready again")
+			waitForNodesReady()
+
 			By("Check eth0 has the default ip address")
 			for _, node := range nodes {
 				Eventually(func() string {
@@ -81,17 +85,14 @@ var _ = Describe("NodeNetworkConfigurationPolicy default bridged network", func(
 			for _, node := range nodes {
 				Eventually(func() string {
 					return defaultRouteNextHopInterface(node)
-				}, 30*time.Second, 1*time.Second).Should(Equal("eth0"))
+				}, 15*time.Second, 1*time.Second).Should(Equal("eth0"))
 			}
 
-			By("Waiting until the node becomes ready again")
-			waitForNodesReady()
-
 			By("Remove the policy")
 			deletePolicy("default-network")
 		})
 
-		It("should successfully move default IP address on top of the bridge", func() {
+		FIt("should successfully move default IP address on top of the bridge", func() {
 			By("Creating the policy")
 			setDesiredStateWithPolicy("default-network", createBridgeOnTheDefaultInterface)
 
@@ -109,11 +110,11 @@ var _ = Describe("NodeNetworkConfigurationPolicy default bridged network", func(
 			for _, node := range nodes {
 				Eventually(func() string {
 					return defaultRouteNextHopInterface(node)
-				}, 30*time.Second, 1*time.Second).Should(Equal("brext"))
+				}, 15*time.Second, 1*time.Second).Should(Equal("brext"))
 
 				By("Verify that VLAN configuration is done properly")
 				hasVlans(node, "eth0", 2, 4094).Should(Succeed())
-				hasVlans(node, "brext", 1, 1).Should(Succeed())
+				vlansCardinality(node, "brext").Should(Equal(0))
 			}
 		})
 	})
@@ -158,6 +159,7 @@ func nodeReadyConditionStatus(nodeName string) (corev1.ConditionStatus, error) {
 }
 
 func waitForNodesReady() {
+	time.Sleep(5 * time.Second)
 	for _, node := range nodes {
 		Eventually(func() (corev1.ConditionStatus, error) {
 			return nodeReadyConditionStatus(node)