Skip to content

Commit b0f6d9f

Browse files
committed
Skip L2 UDN route advertisements tests for LGW mode
Signed-off-by: Peng Liu <[email protected]>
1 parent d5aa5d5 commit b0f6d9f

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

test/e2e/route_advertisements.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
utilnet "k8s.io/utils/net"
2222

23-
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
2423
apierrors "k8s.io/apimachinery/pkg/api/errors"
2524
"k8s.io/apimachinery/pkg/api/meta"
2625
"k8s.io/kubernetes/test/e2e/framework"
@@ -525,10 +524,10 @@ var _ = ginkgo.DescribeTableSubtree("BGP: isolation between advertised networks"
525524
var cudnA, cudnB *udnv1.ClusterUserDefinedNetwork
526525
var ra *rav1.RouteAdvertisements
527526

528-
if cudnATemplate.Spec.Network.Topology == types.Layer2Topology && isLocalGWModeEnabled() {
529-
e2eskipper.Skipf("Advertising Layer2 UDNs is not currently supported in LGW")
530-
}
531527
ginkgo.BeforeEach(func() {
528+
if cudnATemplate.Spec.Network.Topology == udnv1.NetworkTopologyLayer2 && isLocalGWModeEnabled() {
529+
e2eskipper.Skipf("Advertising Layer2 UDNs is not currently supported in LGW")
530+
}
532531
ginkgo.By("Configuring primary UDN namespaces")
533532
var err error
534533
udnNamespaceA, err = f.CreateNamespace(context.TODO(), f.BaseName, map[string]string{
@@ -666,6 +665,9 @@ var _ = ginkgo.DescribeTableSubtree("BGP: isolation between advertised networks"
666665
})
667666

668667
ginkgo.AfterEach(func() {
668+
if cudnATemplate.Spec.Network.Topology == udnv1.NetworkTopologyLayer2 && isLocalGWModeEnabled() {
669+
return
670+
}
669671
gomega.Expect(f.ClientSet.CoreV1().Pods(udnNamespaceA.Name).DeleteCollection(context.Background(), metav1.DeleteOptions{}, metav1.ListOptions{})).To(gomega.Succeed())
670672
gomega.Expect(f.ClientSet.CoreV1().Pods(udnNamespaceB.Name).DeleteCollection(context.Background(), metav1.DeleteOptions{}, metav1.ListOptions{})).To(gomega.Succeed())
671673

0 commit comments

Comments
 (0)