Skip to content

Commit f47c971

Browse files
authored
enabling pod egress traffic test for under mac address policy variation (#3459)
1 parent 707ed10 commit f47c971

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

test/integration/cni/pod_traffic_test.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,9 @@ var _ = Describe("pod egress traffic test", Ordered, func() {
278278
var originalPolicy string
279279
var pod *coreV1.Pod
280280
BeforeAll(func() {
281-
Skip("Skipping pod egress traffic until addon release")
281+
if primaryNode.Status.NodeInfo.OSImage == "Amazon Linux 2" {
282+
Skip("Skipping pod egress Mac address Policy test on Amazon linux 2 node")
283+
}
282284
Expect(checkNodeShellPlugin()).To(BeNil())
283285
originalPolicy, err = currentMacAddressPolicy(primaryNode.Name)
284286
Expect(err).ToNot(HaveOccurred())
@@ -287,6 +289,9 @@ var _ = Describe("pod egress traffic test", Ordered, func() {
287289
f.K8sResourceManagers.PodManager().DeleteAndWaitTillPodDeleted(pod)
288290
})
289291
AfterAll(func() {
292+
if primaryNode.Status.NodeInfo.OSImage == "Amazon Linux 2" {
293+
Skip("Skipping pod egress Mac address Policy test on Amazon linux 2 node")
294+
}
290295
err := setMACAddressPolicy(primaryNode.Name, originalPolicy)
291296
Expect(err).ToNot(HaveOccurred())
292297
})
@@ -295,7 +300,6 @@ var _ = Describe("pod egress traffic test", Ordered, func() {
295300
Context("When MAC address Policy is None", func() {
296301
// check if current policy is none, if not make it none
297302
It("can ping to 8.8.8.8", func() {
298-
Skip("Skipping pod egress traffic until addon release")
299303
Expect(setMACAddressPolicy(primaryNode.Name, None)).Error().ShouldNot(HaveOccurred())
300304
// deploy pod on this node.
301305
pod = manifest.NewDefaultPodBuilder().
@@ -305,7 +309,7 @@ var _ = Describe("pod egress traffic test", Ordered, func() {
305309
pod, err = f.K8sResourceManagers.PodManager().CreateAndWaitTillRunning(pod)
306310
Expect(err).ToNot(HaveOccurred())
307311
command := []string{"ping", "-c", "1", "8.8.8.8"}
308-
stdout, stderr, err := f.K8sResourceManagers.PodManager().PodExec("default", pod.Name, command)
312+
stdout, stderr, err := f.K8sResourceManagers.PodManager().PodExec(utils.DefaultTestNamespace, pod.Name, command)
309313
Expect(err).ToNot(HaveOccurred(), stderr, stdout)
310314
Expect(stderr).To(BeEmpty(), stdout)
311315
Expect(stdout).ToNot(BeEmpty())
@@ -314,7 +318,6 @@ var _ = Describe("pod egress traffic test", Ordered, func() {
314318
Context("When MAC address policy is persistent", func() {
315319
// check if current policy is none, if not make it none
316320
It("can ping to 8.8.8.8", func() {
317-
Skip("Skipping pod egress traffic until addon release")
318321
Expect(setMACAddressPolicy(primaryNode.Name, Persistent)).Error().ShouldNot(HaveOccurred())
319322
// deploy pod on this node.
320323
pod := manifest.NewDefaultPodBuilder().
@@ -323,9 +326,8 @@ var _ = Describe("pod egress traffic test", Ordered, func() {
323326
Build()
324327
pod, err = f.K8sResourceManagers.PodManager().CreateAndWaitTillRunning(pod)
325328
Expect(err).ToNot(HaveOccurred())
326-
327329
command := []string{"ping", "-c", "1", "8.8.8.8"}
328-
stdout, stderr, err := f.K8sResourceManagers.PodManager().PodExec("default", pod.Name, command)
330+
stdout, stderr, err := f.K8sResourceManagers.PodManager().PodExec(utils.DefaultTestNamespace, pod.Name, command)
329331
Expect(err).ToNot(HaveOccurred(), stderr, stdout)
330332
Expect(stderr).To(BeEmpty(), stdout)
331333
Expect(stdout).ToNot(BeEmpty())

0 commit comments

Comments
 (0)