Skip to content

Commit ae7fdd9

Browse files
committed
[e2e, multihoming] Rename multi-netpol tests to avoid duplication.
For example, to focus on a given test here is what I write (exact string): Multi Homing multiple pods connected to the same OVN-K secondary network multi-network policies multi-network policies configure traffic allow lists for a pure L2 overlay when the multi-net policy describes the allow-list using pod selectors Now it will be: Multi Homing multiple pods connected to the same OVN-K secondary network with multi-network policies that configure traffic allow lists using pod selectors for a pure L2 overlay Signed-off-by: Nadia Pinaeva <[email protected]>
1 parent 4812ec9 commit ae7fdd9

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

test/e2e/multihoming.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@ var _ = Describe("Multi Homing", func() {
10491049
})
10501050
})
10511051

1052-
Context("multi-network policies", func() {
1052+
Context("with multi-network policies that", func() {
10531053
const (
10541054
generatedNamespaceNamePrefix = "pepe"
10551055
blockedServerStaticIP = "192.168.200.30"
@@ -1086,7 +1086,7 @@ var _ = Describe("Multi Homing", func() {
10861086
})
10871087

10881088
ginkgo.DescribeTable(
1089-
"multi-network policies configure traffic allow lists",
1089+
"configure traffic allow lists",
10901090
func(netConfigParams networkAttachmentConfigParams, allowedClientPodConfig podConfiguration, blockedClientPodConfig podConfiguration, serverPodConfig podConfiguration, policy *mnpapi.MultiNetworkPolicy) {
10911091
netConfig := newNetworkAttachmentConfig(netConfigParams)
10921092

@@ -1132,7 +1132,7 @@ var _ = Describe("Multi Homing", func() {
11321132
Expect(connectToServer(blockedClientPodConfig, serverIP, port)).To(MatchError(ContainSubstring("exit code 28")))
11331133
},
11341134
ginkgo.Entry(
1135-
"for a pure L2 overlay when the multi-net policy describes the allow-list using pod selectors",
1135+
"using pod selectors for a pure L2 overlay",
11361136
networkAttachmentConfigParams{
11371137
name: secondaryNetworkName,
11381138
topology: "layer2",
@@ -1169,7 +1169,7 @@ var _ = Describe("Multi Homing", func() {
11691169
),
11701170
),
11711171
ginkgo.Entry(
1172-
"for a routed topology when the multi-net policy describes the allow-list using pod selectors",
1172+
"using pod selectors for a routed topology",
11731173
networkAttachmentConfigParams{
11741174
name: secondaryNetworkName,
11751175
topology: "layer3",
@@ -1206,7 +1206,7 @@ var _ = Describe("Multi Homing", func() {
12061206
),
12071207
),
12081208
ginkgo.Entry(
1209-
"for a localnet topology when the multi-net policy describes the allow-list using pod selectors",
1209+
"using pod selectors for a localnet topology",
12101210
networkAttachmentConfigParams{
12111211
name: secondaryNetworkName,
12121212
topology: "localnet",
@@ -1243,7 +1243,7 @@ var _ = Describe("Multi Homing", func() {
12431243
),
12441244
),
12451245
ginkgo.Entry(
1246-
"for a pure L2 overlay when the multi-net policy describes the allow-list using IPBlock",
1246+
"using IPBlock for a pure L2 overlay",
12471247
networkAttachmentConfigParams{
12481248
name: secondaryNetworkName,
12491249
topology: "layer2",
@@ -1275,7 +1275,7 @@ var _ = Describe("Multi Homing", func() {
12751275
),
12761276
),
12771277
ginkgo.Entry(
1278-
"for a routed topology when the multi-net policy describes the allow-list using IPBlock",
1278+
"using IPBlock for a routed topology",
12791279
networkAttachmentConfigParams{
12801280
name: secondaryNetworkName,
12811281
topology: "layer3",
@@ -1307,7 +1307,7 @@ var _ = Describe("Multi Homing", func() {
13071307
),
13081308
),
13091309
ginkgo.Entry(
1310-
"for a localnet topology when the multi-net policy describes the allow-list using IPBlock",
1310+
"using IPBlock for a localnet topology",
13111311
networkAttachmentConfigParams{
13121312
name: secondaryNetworkName,
13131313
topology: "localnet",
@@ -1339,7 +1339,7 @@ var _ = Describe("Multi Homing", func() {
13391339
),
13401340
),
13411341
ginkgo.Entry(
1342-
"for a pure L2 overlay when the multi-net policy describes the allow-list via namespace selectors",
1342+
"using namespace selectors for a pure L2 overlay",
13431343
networkAttachmentConfigParams{
13441344
name: secondaryNetworkName,
13451345
topology: "layer2",
@@ -1373,7 +1373,7 @@ var _ = Describe("Multi Homing", func() {
13731373
),
13741374
),
13751375
ginkgo.Entry(
1376-
"for a routed topology when the multi-net policy describes the allow-list via namespace selectors",
1376+
"using namespace selectors for a routed topology",
13771377
networkAttachmentConfigParams{
13781378
name: secondaryNetworkName,
13791379
topology: "layer3",
@@ -1407,7 +1407,7 @@ var _ = Describe("Multi Homing", func() {
14071407
),
14081408
),
14091409
ginkgo.Entry(
1410-
"for a localnet topology when the multi-net policy describes the allow-list via namespace selectors",
1410+
"using namespace selectors for a localnet topology",
14111411
networkAttachmentConfigParams{
14121412
name: secondaryNetworkName,
14131413
topology: "localnet",
@@ -1442,7 +1442,7 @@ var _ = Describe("Multi Homing", func() {
14421442
),
14431443

14441444
ginkgo.Entry(
1445-
"for an IPAMless pure L2 overlay when the multi-net policy describes the allow-list using IPBlock",
1445+
"using IPBlock for an IPAMless pure L2 overlay",
14461446
networkAttachmentConfigParams{
14471447
name: secondaryNetworkName,
14481448
topology: "layer2",
@@ -1476,7 +1476,7 @@ var _ = Describe("Multi Homing", func() {
14761476
)
14771477

14781478
ginkgo.DescribeTable(
1479-
"multi-network ingress allow all",
1479+
"allow all ingress",
14801480
func(netConfigParams networkAttachmentConfigParams, clientPodConfig podConfiguration, serverPodConfig podConfiguration, policy *mnpapi.MultiNetworkPolicy) {
14811481
netConfig := newNetworkAttachmentConfig(netConfigParams)
14821482

@@ -1507,7 +1507,7 @@ var _ = Describe("Multi Homing", func() {
15071507
}, 2*time.Minute, 6*time.Second).Should(Succeed())
15081508
},
15091509
ginkgo.Entry(
1510-
"for a localnet topology when the multi-net policy is ingress allow-all",
1510+
"using ingress allow-all for a localnet topology",
15111511
networkAttachmentConfigParams{
15121512
name: secondaryNetworkName,
15131513
topology: "localnet",
@@ -1539,7 +1539,7 @@ var _ = Describe("Multi Homing", func() {
15391539
),
15401540
),
15411541
ginkgo.XEntry(
1542-
"for a localnet topology when the multi-net policy is egress deny-all, should not affect ingress",
1542+
"using egress deny-all for a localnet topology",
15431543
networkAttachmentConfigParams{
15441544
name: secondaryNetworkName,
15451545
topology: "localnet",
@@ -1572,7 +1572,7 @@ var _ = Describe("Multi Homing", func() {
15721572
Label("BUG", "OCPBUGS-25928"),
15731573
),
15741574
ginkgo.Entry(
1575-
"for a localnet topology when the multi-net policy is egress deny-all, ingress allow-all",
1575+
"using egress deny-all, ingress allow-all for a localnet topology",
15761576
networkAttachmentConfigParams{
15771577
name: secondaryNetworkName,
15781578
topology: "localnet",
@@ -1608,7 +1608,7 @@ var _ = Describe("Multi Homing", func() {
16081608
)
16091609

16101610
ginkgo.DescribeTable(
1611-
"multi-network ingress deny all policies",
1611+
"deny all",
16121612
func(netConfigParams networkAttachmentConfigParams, clientPodConfig podConfiguration, serverPodConfig podConfiguration, policy *mnpapi.MultiNetworkPolicy) {
16131613
netConfig := newNetworkAttachmentConfig(netConfigParams)
16141614

@@ -1639,7 +1639,7 @@ var _ = Describe("Multi Homing", func() {
16391639
}, 2*time.Minute, 6*time.Second).Should(Not(Succeed()))
16401640
},
16411641
ginkgo.Entry(
1642-
"for a localnet topology when the multi-net policy is ingress deny-all",
1642+
"using ingress deny-all for a localnet topology",
16431643
networkAttachmentConfigParams{
16441644
name: secondaryNetworkName,
16451645
topology: "localnet",

0 commit comments

Comments
 (0)