From 04338c84679481855a75ded2cc251fa656d14d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Wed, 28 Sep 2022 17:44:25 +0800 Subject: [PATCH] fix underlay e2e testing (#1929) --- pkg/daemon/init.go | 3 ++- test/e2e/underlay/underlay.go | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkg/daemon/init.go b/pkg/daemon/init.go index e096553adb3..3a860377c79 100644 --- a/pkg/daemon/init.go +++ b/pkg/daemon/init.go @@ -5,6 +5,7 @@ import ( "fmt" "net" "strings" + "syscall" "time" "github.com/Wifx/gonetworkmanager" @@ -199,7 +200,7 @@ func changeProvideNicName(current, target string) (bool, error) { continue } if route.Scope == scope { - if err = netlink.RouteReplace(&route); err != nil { + if err = netlink.RouteReplace(&route); err != nil && err != syscall.EEXIST { klog.Errorf("failed to replace route %s: %v", route.String(), err) return false, err } diff --git a/test/e2e/underlay/underlay.go b/test/e2e/underlay/underlay.go index e83eb125fe1..acb6acf4c53 100644 --- a/test/e2e/underlay/underlay.go +++ b/test/e2e/underlay/underlay.go @@ -197,7 +197,10 @@ var _ = Describe("[Underlay]", func() { Expect(err).NotTo(HaveOccurred()) } + By("wait provider network to be ready") time.Sleep(3 * time.Second) + err = f.WaitProviderNetworkReady(ProviderNetwork) + Expect(err).NotTo(HaveOccurred()) By("validate provider network") pn, err := f.OvnClientSet.KubeovnV1().ProviderNetworks().Get(context.Background(), ProviderNetwork, metav1.GetOptions{}) @@ -222,6 +225,11 @@ var _ = Describe("[Underlay]", func() { newPn.Spec.ExcludeNodes = nil _, err = f.OvnClientSet.KubeovnV1().ProviderNetworks().Update(context.Background(), newPn, metav1.UpdateOptions{}) Expect(err).NotTo(HaveOccurred()) + + By("wait provider network to be ready") + time.Sleep(3 * time.Second) + err = f.WaitProviderNetworkReady(ProviderNetwork) + Expect(err).NotTo(HaveOccurred()) }) })