From 8c46a567512e2ede4511f6e6a266c8e3290bc66e Mon Sep 17 00:00:00 2001 From: Surya Seetharaman Date: Sun, 11 Jun 2023 20:16:30 +0200 Subject: [PATCH] Address review comments: move base yamls This commit simply moves the base yamls from the test folder into the base folder under sub directories that can be easily maintained. Signed-off-by: Surya Seetharaman --- .../admin_network_policy/core-egress-sctp-rules.yaml} | 0 .../admin_network_policy/core-egress-tcp-rules.yaml} | 0 .../admin_network_policy/core-egress-udp-rules.yaml} | 0 .../admin_network_policy/core-ingress-sctp-rules.yaml} | 0 .../admin_network_policy/core-ingress-tcp-rules.yaml} | 0 .../admin_network_policy/core-ingress-udp-rules.yaml} | 0 .../baseline_admin_network_policy/core-egress-sctp-rules.yaml} | 0 .../baseline_admin_network_policy/core-egress-tcp-rules.yaml} | 0 .../baseline_admin_network_policy/core-egress-udp-rules.yaml} | 0 .../baseline_admin_network_policy/core-ingress-sctp-rules.yaml} | 0 .../baseline_admin_network_policy/core-ingress-tcp-rules.yaml} | 0 .../baseline_admin_network_policy/core-ingress-udp-rules.yaml} | 0 .../tests/admin-network-policy-core-egress-sctp-rules.go | 2 +- conformance/tests/admin-network-policy-core-egress-tcp-rules.go | 2 +- conformance/tests/admin-network-policy-core-egress-udp-rules.go | 2 +- .../tests/admin-network-policy-core-ingress-sctp-rules.go | 2 +- .../tests/admin-network-policy-core-ingress-tcp-rules.go | 2 +- .../tests/admin-network-policy-core-ingress-udp-rules.go | 2 +- .../baseline-admin-network-policy-core-egress-sctp-rules.go | 2 +- .../baseline-admin-network-policy-core-egress-tcp-rules.go | 2 +- .../baseline-admin-network-policy-core-egress-udp-rules.go | 2 +- .../baseline-admin-network-policy-core-ingress-sctp-rules.go | 2 +- .../baseline-admin-network-policy-core-ingress-tcp-rules.go | 2 +- .../baseline-admin-network-policy-core-ingress-udp-rules.go | 2 +- 24 files changed, 12 insertions(+), 12 deletions(-) rename conformance/{tests/admin-network-policy-core-egress-sctp-rules_base.yaml => base/admin_network_policy/core-egress-sctp-rules.yaml} (100%) rename conformance/{tests/admin-network-policy-core-egress-tcp-rules_base.yaml => base/admin_network_policy/core-egress-tcp-rules.yaml} (100%) rename conformance/{tests/admin-network-policy-core-egress-udp-rules_base.yaml => base/admin_network_policy/core-egress-udp-rules.yaml} (100%) rename conformance/{tests/admin-network-policy-core-ingress-sctp-rules_base.yaml => base/admin_network_policy/core-ingress-sctp-rules.yaml} (100%) rename conformance/{tests/admin-network-policy-core-ingress-tcp-rules_base.yaml => base/admin_network_policy/core-ingress-tcp-rules.yaml} (100%) rename conformance/{tests/admin-network-policy-core-ingress-udp-rules_base.yaml => base/admin_network_policy/core-ingress-udp-rules.yaml} (100%) rename conformance/{tests/baseline-admin-network-policy-core-egress-sctp-rules_base.yaml => base/baseline_admin_network_policy/core-egress-sctp-rules.yaml} (100%) rename conformance/{tests/baseline-admin-network-policy-core-egress-tcp-rules_base.yaml => base/baseline_admin_network_policy/core-egress-tcp-rules.yaml} (100%) rename conformance/{tests/baseline-admin-network-policy-core-egress-udp-rules_base.yaml => base/baseline_admin_network_policy/core-egress-udp-rules.yaml} (100%) rename conformance/{tests/baseline-admin-network-policy-core-ingress-sctp-rules_base.yaml => base/baseline_admin_network_policy/core-ingress-sctp-rules.yaml} (100%) rename conformance/{tests/baseline-admin-network-policy-core-ingress-tcp-rules_base.yaml => base/baseline_admin_network_policy/core-ingress-tcp-rules.yaml} (100%) rename conformance/{tests/baseline-admin-network-policy-core-ingress-udp-rules_base.yaml => base/baseline_admin_network_policy/core-ingress-udp-rules.yaml} (100%) diff --git a/conformance/tests/admin-network-policy-core-egress-sctp-rules_base.yaml b/conformance/base/admin_network_policy/core-egress-sctp-rules.yaml similarity index 100% rename from conformance/tests/admin-network-policy-core-egress-sctp-rules_base.yaml rename to conformance/base/admin_network_policy/core-egress-sctp-rules.yaml diff --git a/conformance/tests/admin-network-policy-core-egress-tcp-rules_base.yaml b/conformance/base/admin_network_policy/core-egress-tcp-rules.yaml similarity index 100% rename from conformance/tests/admin-network-policy-core-egress-tcp-rules_base.yaml rename to conformance/base/admin_network_policy/core-egress-tcp-rules.yaml diff --git a/conformance/tests/admin-network-policy-core-egress-udp-rules_base.yaml b/conformance/base/admin_network_policy/core-egress-udp-rules.yaml similarity index 100% rename from conformance/tests/admin-network-policy-core-egress-udp-rules_base.yaml rename to conformance/base/admin_network_policy/core-egress-udp-rules.yaml diff --git a/conformance/tests/admin-network-policy-core-ingress-sctp-rules_base.yaml b/conformance/base/admin_network_policy/core-ingress-sctp-rules.yaml similarity index 100% rename from conformance/tests/admin-network-policy-core-ingress-sctp-rules_base.yaml rename to conformance/base/admin_network_policy/core-ingress-sctp-rules.yaml diff --git a/conformance/tests/admin-network-policy-core-ingress-tcp-rules_base.yaml b/conformance/base/admin_network_policy/core-ingress-tcp-rules.yaml similarity index 100% rename from conformance/tests/admin-network-policy-core-ingress-tcp-rules_base.yaml rename to conformance/base/admin_network_policy/core-ingress-tcp-rules.yaml diff --git a/conformance/tests/admin-network-policy-core-ingress-udp-rules_base.yaml b/conformance/base/admin_network_policy/core-ingress-udp-rules.yaml similarity index 100% rename from conformance/tests/admin-network-policy-core-ingress-udp-rules_base.yaml rename to conformance/base/admin_network_policy/core-ingress-udp-rules.yaml diff --git a/conformance/tests/baseline-admin-network-policy-core-egress-sctp-rules_base.yaml b/conformance/base/baseline_admin_network_policy/core-egress-sctp-rules.yaml similarity index 100% rename from conformance/tests/baseline-admin-network-policy-core-egress-sctp-rules_base.yaml rename to conformance/base/baseline_admin_network_policy/core-egress-sctp-rules.yaml diff --git a/conformance/tests/baseline-admin-network-policy-core-egress-tcp-rules_base.yaml b/conformance/base/baseline_admin_network_policy/core-egress-tcp-rules.yaml similarity index 100% rename from conformance/tests/baseline-admin-network-policy-core-egress-tcp-rules_base.yaml rename to conformance/base/baseline_admin_network_policy/core-egress-tcp-rules.yaml diff --git a/conformance/tests/baseline-admin-network-policy-core-egress-udp-rules_base.yaml b/conformance/base/baseline_admin_network_policy/core-egress-udp-rules.yaml similarity index 100% rename from conformance/tests/baseline-admin-network-policy-core-egress-udp-rules_base.yaml rename to conformance/base/baseline_admin_network_policy/core-egress-udp-rules.yaml diff --git a/conformance/tests/baseline-admin-network-policy-core-ingress-sctp-rules_base.yaml b/conformance/base/baseline_admin_network_policy/core-ingress-sctp-rules.yaml similarity index 100% rename from conformance/tests/baseline-admin-network-policy-core-ingress-sctp-rules_base.yaml rename to conformance/base/baseline_admin_network_policy/core-ingress-sctp-rules.yaml diff --git a/conformance/tests/baseline-admin-network-policy-core-ingress-tcp-rules_base.yaml b/conformance/base/baseline_admin_network_policy/core-ingress-tcp-rules.yaml similarity index 100% rename from conformance/tests/baseline-admin-network-policy-core-ingress-tcp-rules_base.yaml rename to conformance/base/baseline_admin_network_policy/core-ingress-tcp-rules.yaml diff --git a/conformance/tests/baseline-admin-network-policy-core-ingress-udp-rules_base.yaml b/conformance/base/baseline_admin_network_policy/core-ingress-udp-rules.yaml similarity index 100% rename from conformance/tests/baseline-admin-network-policy-core-ingress-udp-rules_base.yaml rename to conformance/base/baseline_admin_network_policy/core-ingress-udp-rules.yaml diff --git a/conformance/tests/admin-network-policy-core-egress-sctp-rules.go b/conformance/tests/admin-network-policy-core-egress-sctp-rules.go index fe8c97d2..3d4f5380 100644 --- a/conformance/tests/admin-network-policy-core-egress-sctp-rules.go +++ b/conformance/tests/admin-network-policy-core-egress-sctp-rules.go @@ -42,7 +42,7 @@ var AdminNetworkPolicyEgressSCTP = suite.ConformanceTest{ Features: []suite.SupportedFeature{ suite.SupportAdminNetworkPolicy, }, - Manifests: []string{"tests/admin-network-policy-core-egress-sctp-rules_base.yaml"}, + Manifests: []string{"base/admin_network_policy/core-egress-sctp-rules.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { t.Run("Should support an 'allow-egress' policy for SCTP protocol; ensure rule ordering is respected", func(t *testing.T) { diff --git a/conformance/tests/admin-network-policy-core-egress-tcp-rules.go b/conformance/tests/admin-network-policy-core-egress-tcp-rules.go index 05ff7474..b2d7fda6 100644 --- a/conformance/tests/admin-network-policy-core-egress-tcp-rules.go +++ b/conformance/tests/admin-network-policy-core-egress-tcp-rules.go @@ -42,7 +42,7 @@ var AdminNetworkPolicyEgressTCP = suite.ConformanceTest{ Features: []suite.SupportedFeature{ suite.SupportAdminNetworkPolicy, }, - Manifests: []string{"tests/admin-network-policy-core-egress-tcp-rules_base.yaml"}, + Manifests: []string{"base/admin_network_policy/core-egress-tcp-rules.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { t.Run("Should support an 'allow-egress' policy for TCP protocol; ensure rule ordering is respected", func(t *testing.T) { diff --git a/conformance/tests/admin-network-policy-core-egress-udp-rules.go b/conformance/tests/admin-network-policy-core-egress-udp-rules.go index 894be352..c634a1ba 100644 --- a/conformance/tests/admin-network-policy-core-egress-udp-rules.go +++ b/conformance/tests/admin-network-policy-core-egress-udp-rules.go @@ -42,7 +42,7 @@ var AdminNetworkPolicyEgressUDP = suite.ConformanceTest{ Features: []suite.SupportedFeature{ suite.SupportAdminNetworkPolicy, }, - Manifests: []string{"tests/admin-network-policy-core-egress-udp-rules_base.yaml"}, + Manifests: []string{"base/admin_network_policy/core-egress-udp-rules.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { t.Run("Should support an 'allow-egress' policy for UDP protocol; ensure rule ordering is respected", func(t *testing.T) { diff --git a/conformance/tests/admin-network-policy-core-ingress-sctp-rules.go b/conformance/tests/admin-network-policy-core-ingress-sctp-rules.go index da15aa3c..4de4e1e1 100644 --- a/conformance/tests/admin-network-policy-core-ingress-sctp-rules.go +++ b/conformance/tests/admin-network-policy-core-ingress-sctp-rules.go @@ -42,7 +42,7 @@ var AdminNetworkPolicyIngressSCTP = suite.ConformanceTest{ Features: []suite.SupportedFeature{ suite.SupportAdminNetworkPolicy, }, - Manifests: []string{"tests/admin-network-policy-core-ingress-sctp-rules_base.yaml"}, + Manifests: []string{"base/admin_network_policy/core-ingress-sctp-rules.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { t.Run("Should support an 'allow-ingress' policy for SCTP protocol; ensure rule ordering is respected", func(t *testing.T) { diff --git a/conformance/tests/admin-network-policy-core-ingress-tcp-rules.go b/conformance/tests/admin-network-policy-core-ingress-tcp-rules.go index 88a0e44d..6b43f56f 100644 --- a/conformance/tests/admin-network-policy-core-ingress-tcp-rules.go +++ b/conformance/tests/admin-network-policy-core-ingress-tcp-rules.go @@ -42,7 +42,7 @@ var AdminNetworkPolicyIngressTCP = suite.ConformanceTest{ Features: []suite.SupportedFeature{ suite.SupportAdminNetworkPolicy, }, - Manifests: []string{"tests/admin-network-policy-core-ingress-tcp-rules_base.yaml"}, + Manifests: []string{"base/admin_network_policy/core-ingress-tcp-rules.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { t.Run("Should support an 'allow-ingress' policy for TCP protocol; ensure rule ordering is respected", func(t *testing.T) { diff --git a/conformance/tests/admin-network-policy-core-ingress-udp-rules.go b/conformance/tests/admin-network-policy-core-ingress-udp-rules.go index ac710107..f8f2c2f6 100644 --- a/conformance/tests/admin-network-policy-core-ingress-udp-rules.go +++ b/conformance/tests/admin-network-policy-core-ingress-udp-rules.go @@ -42,7 +42,7 @@ var AdminNetworkPolicyIngressUDP = suite.ConformanceTest{ Features: []suite.SupportedFeature{ suite.SupportAdminNetworkPolicy, }, - Manifests: []string{"tests/admin-network-policy-core-ingress-udp-rules_base.yaml"}, + Manifests: []string{"base/admin_network_policy/core-ingress-udp-rules.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { t.Run("Should support an 'allow-ingress' policy for UDP protocol; ensure rule ordering is respected", func(t *testing.T) { diff --git a/conformance/tests/baseline-admin-network-policy-core-egress-sctp-rules.go b/conformance/tests/baseline-admin-network-policy-core-egress-sctp-rules.go index 09b5b1ba..b0ee1f11 100644 --- a/conformance/tests/baseline-admin-network-policy-core-egress-sctp-rules.go +++ b/conformance/tests/baseline-admin-network-policy-core-egress-sctp-rules.go @@ -42,7 +42,7 @@ var BaselineAdminNetworkPolicyEgressSCTP = suite.ConformanceTest{ Features: []suite.SupportedFeature{ suite.SupportBaselineAdminNetworkPolicy, }, - Manifests: []string{"tests/baseline-admin-network-policy-core-egress-sctp-rules_base.yaml"}, + Manifests: []string{"base/baseline_admin_network_policy/core-egress-sctp-rules.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { t.Run("Should support an 'allow-egress' policy for SCTP protocol; ensure rule ordering is respected", func(t *testing.T) { diff --git a/conformance/tests/baseline-admin-network-policy-core-egress-tcp-rules.go b/conformance/tests/baseline-admin-network-policy-core-egress-tcp-rules.go index cc0e850f..3afa9503 100644 --- a/conformance/tests/baseline-admin-network-policy-core-egress-tcp-rules.go +++ b/conformance/tests/baseline-admin-network-policy-core-egress-tcp-rules.go @@ -42,7 +42,7 @@ var BaselineAdminNetworkPolicyEgressTCP = suite.ConformanceTest{ Features: []suite.SupportedFeature{ suite.SupportBaselineAdminNetworkPolicy, }, - Manifests: []string{"tests/baseline-admin-network-policy-core-egress-tcp-rules_base.yaml"}, + Manifests: []string{"base/baseline_admin_network_policy/core-egress-tcp-rules.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { t.Run("Should support an 'allow-egress' policy for TCP protocol; ensure rule ordering is respected", func(t *testing.T) { diff --git a/conformance/tests/baseline-admin-network-policy-core-egress-udp-rules.go b/conformance/tests/baseline-admin-network-policy-core-egress-udp-rules.go index c669c69d..e3c034fa 100644 --- a/conformance/tests/baseline-admin-network-policy-core-egress-udp-rules.go +++ b/conformance/tests/baseline-admin-network-policy-core-egress-udp-rules.go @@ -42,7 +42,7 @@ var BaselineAdminNetworkPolicyEgressUDP = suite.ConformanceTest{ Features: []suite.SupportedFeature{ suite.SupportBaselineAdminNetworkPolicy, }, - Manifests: []string{"tests/baseline-admin-network-policy-core-egress-udp-rules_base.yaml"}, + Manifests: []string{"base/baseline_admin_network_policy/core-egress-udp-rules.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { t.Run("Should support an 'allow-egress' policy for UDP protocol; ensure rule ordering is respected", func(t *testing.T) { diff --git a/conformance/tests/baseline-admin-network-policy-core-ingress-sctp-rules.go b/conformance/tests/baseline-admin-network-policy-core-ingress-sctp-rules.go index 2111791f..69eafb1d 100644 --- a/conformance/tests/baseline-admin-network-policy-core-ingress-sctp-rules.go +++ b/conformance/tests/baseline-admin-network-policy-core-ingress-sctp-rules.go @@ -42,7 +42,7 @@ var BaselineAdminNetworkPolicyIngressSCTP = suite.ConformanceTest{ Features: []suite.SupportedFeature{ suite.SupportBaselineAdminNetworkPolicy, }, - Manifests: []string{"tests/baseline-admin-network-policy-core-ingress-sctp-rules_base.yaml"}, + Manifests: []string{"base/baseline_admin_network_policy/core-ingress-sctp-rules.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { t.Run("Should support an 'allow-ingress' policy for SCTP protocol; ensure rule ordering is respected", func(t *testing.T) { diff --git a/conformance/tests/baseline-admin-network-policy-core-ingress-tcp-rules.go b/conformance/tests/baseline-admin-network-policy-core-ingress-tcp-rules.go index c76af2fe..f4cc5d2b 100644 --- a/conformance/tests/baseline-admin-network-policy-core-ingress-tcp-rules.go +++ b/conformance/tests/baseline-admin-network-policy-core-ingress-tcp-rules.go @@ -42,7 +42,7 @@ var BaselineAdminNetworkPolicyIngressTCP = suite.ConformanceTest{ Features: []suite.SupportedFeature{ suite.SupportBaselineAdminNetworkPolicy, }, - Manifests: []string{"tests/baseline-admin-network-policy-core-ingress-tcp-rules_base.yaml"}, + Manifests: []string{"base/baseline_admin_network_policy/core-ingress-tcp-rules.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { t.Run("Should support an 'allow-ingress' policy for TCP protocol; ensure rule ordering is respected", func(t *testing.T) { diff --git a/conformance/tests/baseline-admin-network-policy-core-ingress-udp-rules.go b/conformance/tests/baseline-admin-network-policy-core-ingress-udp-rules.go index 1f3807cf..6b7cb083 100644 --- a/conformance/tests/baseline-admin-network-policy-core-ingress-udp-rules.go +++ b/conformance/tests/baseline-admin-network-policy-core-ingress-udp-rules.go @@ -42,7 +42,7 @@ var BaselineAdminNetworkPolicyIngressUDP = suite.ConformanceTest{ Features: []suite.SupportedFeature{ suite.SupportBaselineAdminNetworkPolicy, }, - Manifests: []string{"tests/baseline-admin-network-policy-core-ingress-udp-rules_base.yaml"}, + Manifests: []string{"base/baseline_admin_network_policy/core-ingress-udp-rules.yaml"}, Test: func(t *testing.T, s *suite.ConformanceTestSuite) { t.Run("Should support an 'allow-ingress' policy for UDP protocol; ensure rule ordering is respected", func(t *testing.T) {