Skip to content

Commit d7a7952

Browse files
committed
Enable test for LGW L2
1 parent cec6222 commit d7a7952

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

test/extended/networking/route_advertisements.go

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -385,13 +385,6 @@ var _ = g.Describe("[sig-network][OCPFeatureGate:RouteAdvertisements][Feature:Ro
385385

386386
var err error
387387
var snifferPodsNodes []string
388-
// Check if the cluster is in local gateway mode
389-
network, err := oc.AdminOperatorClient().OperatorV1().Networks().Get(context.TODO(), "cluster", metav1.GetOptions{})
390-
o.Expect(err).NotTo(o.HaveOccurred())
391-
if network.Spec.DefaultNetwork.OVNKubernetesConfig.GatewayConfig != nil && network.Spec.DefaultNetwork.OVNKubernetesConfig.GatewayConfig.RoutingViaHost && testCUDNTopology == "layer2" {
392-
// TODO: unskip once CORENET-5881 is done.
393-
skipper.Skipf("Skipping Layer2 UDN advertisements test for local gateway mode")
394-
}
395388
if testCUDNTopology == "layer2" {
396389
// Running the packet sniffer on all nodes in the cluster for Layer2 UDN
397390
nodes, err := clientset.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
@@ -563,12 +556,11 @@ var _ = g.Describe("[sig-network][OCPFeatureGate:RouteAdvertisements][Feature:Ro
563556

564557
// All VRF-Lite checks for 'vrfLiteCUDNName' need to happen on a
565558
// single test (or otherwise we should resort to a serial job)
566-
// This test has a long timeout due to its serial nature and also
567-
// because of OCPBUGS-56488
568-
g.It("Pods should be able to communicate on a secondary network [Timeout:30m]", func() {
559+
// This test has a long timeout due to its serial nature, testing both
560+
// Layer 3 and Layer 2 topologies serially, and also because of OCPBUGS-56488
561+
g.It("Pods should be able to communicate on a secondary network [Timeout:45m]", func() {
569562
g.By("testing with a layer 3 CUDN", func() { test("layer3") })
570-
// TODO: Add test for layer 2 UDN once CORENET-5881 is done.
571-
//g.By("testing with a layer 2 CUDN", func() { test("layer2") })
563+
g.By("testing with a layer 2 CUDN", func() { test("layer2") })
572564
})
573565
})
574566
})

test/extended/util/annotate/generated/zz_generated.annotations.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zz_generated.manifests/test-reporting.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ spec:
631631
when using openshift ovn-kubernetes [PodNetwork] Advertising a cluster user
632632
defined network [apigroup:user.openshift.io][apigroup:security.openshift.io]
633633
Over a VRF-Lite configuration Pods should be able to communicate on a secondary
634-
network [Timeout:30m]'
634+
network [Timeout:45m]'
635635
- testName: '[sig-network][OCPFeatureGate:RouteAdvertisements][Feature:RouteAdvertisements][apigroup:operator.openshift.io]
636636
when using openshift ovn-kubernetes [PodNetwork] Advertising a cluster user
637637
defined network [apigroup:user.openshift.io][apigroup:security.openshift.io]

0 commit comments

Comments
 (0)