e2e: rename testdata package to testscenario

Signed-off-by: Jaime Caamaño Ruiz <[email protected]>

Author: jcaamano

test/e2e/network_segmentation_api_validations.go

@@ -6,13 +6,13 @@ import (
 
 	e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl"
 
-	"github.com/ovn-org/ovn-kubernetes/test/e2e/testdata"
-	testdatacudn "github.com/ovn-org/ovn-kubernetes/test/e2e/testdata/cudn"
+	"github.com/ovn-org/ovn-kubernetes/test/e2e/testscenario"
+	testscenariocudn "github.com/ovn-org/ovn-kubernetes/test/e2e/testscenario/cudn"
 )
 
 var _ = Describe("Network Segmentation: API validations", func() {
 	DescribeTable("api-server should reject invalid CRs",
-		func(scenarios []testdata.ValidateCRScenario) {
+		func(scenarios []testscenario.ValidateCRScenario) {
 			DeferCleanup(func() {
 				cleanupValidateCRsTest(scenarios)
 			})
@@ -23,16 +23,16 @@ var _ = Describe("Network Segmentation: API validations", func() {
 				Expect(stderr).To(ContainSubstring(s.ExpectedErr))
 			}
 		},
-		Entry("ClusterUserDefinedNetwork, mismatch topology and config", testdatacudn.MismatchTopologyConfig),
-		Entry("ClusterUserDefinedNetwork, localnet, invalid role", testdatacudn.LocalnetInvalidRole),
-		Entry("ClusterUserDefinedNetwork, localnet, invalid physicalNetworkName", testdatacudn.LocalnetInvalidPhyNetName),
-		Entry("ClusterUserDefinedNetwork, localnet, invalid subnets", testdatacudn.LocalnetInvalidSubnets),
-		Entry("ClusterUserDefinedNetwork, localnet, invalid mtu", testdatacudn.LocalnetInvalidMTU),
-		Entry("ClusterUserDefinedNetwork, localnet, invalid vlan", testdatacudn.LocalnetInvalidVLAN),
+		Entry("ClusterUserDefinedNetwork, mismatch topology and config", testscenariocudn.MismatchTopologyConfig),
+		Entry("ClusterUserDefinedNetwork, localnet, invalid role", testscenariocudn.LocalnetInvalidRole),
+		Entry("ClusterUserDefinedNetwork, localnet, invalid physicalNetworkName", testscenariocudn.LocalnetInvalidPhyNetName),
+		Entry("ClusterUserDefinedNetwork, localnet, invalid subnets", testscenariocudn.LocalnetInvalidSubnets),
+		Entry("ClusterUserDefinedNetwork, localnet, invalid mtu", testscenariocudn.LocalnetInvalidMTU),
+		Entry("ClusterUserDefinedNetwork, localnet, invalid vlan", testscenariocudn.LocalnetInvalidVLAN),
 	)
 
 	DescribeTable("api-server should accept valid CRs",
-		func(scenarios []testdata.ValidateCRScenario) {
+		func(scenarios []testscenario.ValidateCRScenario) {
 			DeferCleanup(func() {
 				cleanupValidateCRsTest(scenarios)
 			})
@@ -42,7 +42,7 @@ var _ = Describe("Network Segmentation: API validations", func() {
 				Expect(err).NotTo(HaveOccurred(), "should create valid CR successfully")
 			}
 		},
-		Entry("ClusterUserDefinedNetwork, localnet", testdatacudn.LocalnetValid),
+		Entry("ClusterUserDefinedNetwork, localnet", testscenariocudn.LocalnetValid),
 	)
 })
 
@@ -52,7 +52,7 @@ func runKubectlInputWithFullOutput(namespace string, data string, args ...string
 	return e2ekubectl.NewKubectlCommand(namespace, args...).WithStdinData(data).ExecWithFullOutput()
 }
 
-func cleanupValidateCRsTest(scenarios []testdata.ValidateCRScenario) {
+func cleanupValidateCRsTest(scenarios []testscenario.ValidateCRScenario) {
 	for _, s := range scenarios {
 		e2ekubectl.RunKubectlInput("", s.Manifest, "delete", "-f", "-")
 	}

test/e2e/testdata/cudn/invalid-scenarios-localnet-mtu.go renamed to test/e2e/testscenario/cudn/invalid-scenarios-localnet-mtu.go

@@ -1,8 +1,8 @@
 package cudn
 
-import "github.com/ovn-org/ovn-kubernetes/test/e2e/testdata"
+import "github.com/ovn-org/ovn-kubernetes/test/e2e/testscenario"
 
-var LocalnetInvalidMTU = []testdata.ValidateCRScenario{
+var LocalnetInvalidMTU = []testscenario.ValidateCRScenario{
 	{
 		Description: "invalid MTU - higher than 65536",
 		ExpectedErr: `spec.network.localnet.mtu in body should be less than or equal to 65536`,

test/e2e/testdata/cudn/invalid-scenarios-localnet-phynetname.go renamed to test/e2e/testscenario/cudn/invalid-scenarios-localnet-phynetname.go

@@ -1,8 +1,8 @@
 package cudn
 
-import "github.com/ovn-org/ovn-kubernetes/test/e2e/testdata"
+import "github.com/ovn-org/ovn-kubernetes/test/e2e/testscenario"
 
-var LocalnetInvalidPhyNetName = []testdata.ValidateCRScenario{
+var LocalnetInvalidPhyNetName = []testscenario.ValidateCRScenario{
 	{
 		Description: "unset PhysicalNetworkName",
 		ExpectedErr: `spec.network.localnet.physicalNetworkName: Required value`,

test/e2e/testdata/cudn/invalid-scenarios-localnet-role.go renamed to test/e2e/testscenario/cudn/invalid-scenarios-localnet-role.go

@@ -1,8 +1,8 @@
 package cudn
 
-import "github.com/ovn-org/ovn-kubernetes/test/e2e/testdata"
+import "github.com/ovn-org/ovn-kubernetes/test/e2e/testscenario"
 
-var LocalnetInvalidRole = []testdata.ValidateCRScenario{
+var LocalnetInvalidRole = []testscenario.ValidateCRScenario{
 	{
 		Description: "role unset",
 		ExpectedErr: `spec.network.localnet.role: Required value`,

test/e2e/testdata/cudn/invalid-scenarios-localnet-subnets.go renamed to test/e2e/testscenario/cudn/invalid-scenarios-localnet-subnets.go

@@ -1,8 +1,8 @@
 package cudn
 
-import "github.com/ovn-org/ovn-kubernetes/test/e2e/testdata"
+import "github.com/ovn-org/ovn-kubernetes/test/e2e/testscenario"
 
-var LocalnetInvalidSubnets = []testdata.ValidateCRScenario{
+var LocalnetInvalidSubnets = []testscenario.ValidateCRScenario{
 	{
 		Description: "unset subnets, and ipam.mode is unset",
 		ExpectedErr: `Subnets is required with ipam.mode is Enabled or unset, and forbidden otherwise`,

test/e2e/testdata/cudn/invalid-scenarios-localnet-vlan.go renamed to test/e2e/testscenario/cudn/invalid-scenarios-localnet-vlan.go

@@ -1,8 +1,8 @@
 package cudn
 
-import "github.com/ovn-org/ovn-kubernetes/test/e2e/testdata"
+import "github.com/ovn-org/ovn-kubernetes/test/e2e/testscenario"
 
-var LocalnetInvalidVLAN = []testdata.ValidateCRScenario{
+var LocalnetInvalidVLAN = []testscenario.ValidateCRScenario{
 	{
 		Description: "invalid VLAN - invalid mode",
 		ExpectedErr: `spec.network.localnet.vlan.mode: Unsupported value: "Disabled": supported values: "Access`,

test/e2e/testdata/cudn/invalid-scenarios-mismatch-topo-conf.go renamed to test/e2e/testscenario/cudn/invalid-scenarios-mismatch-topo-conf.go

@@ -1,8 +1,8 @@
 package cudn
 
-import "github.com/ovn-org/ovn-kubernetes/test/e2e/testdata"
+import "github.com/ovn-org/ovn-kubernetes/test/e2e/testscenario"
 
-var MismatchTopologyConfig = []testdata.ValidateCRScenario{
+var MismatchTopologyConfig = []testscenario.ValidateCRScenario{
 	{
 		Description: "topology is localnet but topology config is layer2",
 		ExpectedErr: `spec.localnet is required when topology is Localnet and forbidden otherwise`,

test/e2e/testdata/cudn/valid-scenarios-localnet.go renamed to test/e2e/testscenario/cudn/valid-scenarios-localnet.go

@@ -1,8 +1,8 @@
 package cudn
 
-import "github.com/ovn-org/ovn-kubernetes/test/e2e/testdata"
+import "github.com/ovn-org/ovn-kubernetes/test/e2e/testscenario"
 
-var LocalnetValid = []testdata.ValidateCRScenario{
+var LocalnetValid = []testscenario.ValidateCRScenario{
 	{
 		Description: "should create localnet topology successfully - minimal",
 		Manifest: `

test/e2e/testdata/scenario.go renamed to test/e2e/testscenario/scenario.go

@@ -1,4 +1,4 @@
-package testdata
+package testscenario
 
 // ValidateCRScenario represent test scenario where a manifest is applied and failed with the expected error
 type ValidateCRScenario struct {