Revert "Zoning E2E Test + E2E Improvements (#818)"

This reverts commit b734947.

tests/README.md

@@ -64,8 +64,6 @@ go get github.com/onsi/gomega/...
 
 For PowerFlex, Unity, PowerScale, PowerStore, Authorization, and Application-Mobility, system-specific information (array login credentials, system IDs, endpoints, etc.) need to be provided in e2e/array-info.sh so that all the required resources (secrets, storageclasses, etc.) can be created by the tests. Example values have been inserted; please replace these with values from your system. Refer to [CSM documentation](https://dell.github.io/csm-docs/docs/) for any further questions about driver or module pre-requisites.
 
-In the case of end-to-end tests that involve PowerFlex zoning functionality, a second PowerFlex array will be necessary with its credentials provided in e2e/array-info.sh.
-
 Please note that, if tests are stopped in the middle of a run, some files in `testfiles/*-templates` folders may remain in a partially modified state and break subsequent test runs. To undo these changes, you can run `git checkout -- <template file>`.
 
 ### Application Mobility Prerequisites
@@ -140,15 +138,15 @@ An e2e test scenarios file is a yaml file that defines all e2e test scenarios to
     - "Enable forceRemoveDriver on CR"
     - "Delete resources"
   customTest:
-
-    - name: Cert CSI # name of custom test to run
-      # Provide command-line argument to run. Ginkgo will run the command and return output
-      # The command should be accessible from e2e_tes repo.
-      # Example:
-      #   ./hello_world.sh
-      #   cert-csi test vio --sc <storage class> --chainNumber 2 --chainLength 2
-      run:
-        - cert-csi test vio --sc isilon --chainNumber 2 --chainLength 2
+    # name of custom test to run
+    name: Cert CSI
+    # Provide command-line argument to run. Ginkgo will run the command and return output
+    # The command should be accessible from e2e_tes repo.
+    # Example:
+    #   ./hello_world.sh
+    #   cert-csi test vio --sc <storage class> --chainNumber 2 --chainLength 2
+    run:
+      - cert-csi test vio --sc isilon --chainNumber 2 --chainLength 2
 ```
 
 Each test has:
@@ -157,11 +155,7 @@ Each test has:
 - `path`: The path to the custom resources yaml file that has the specific configuration you want to test.
 - `tags`: Each test can belong to one or more groups of tests, specified by tags. To see a list of currently available tags, run `./run-e2e-test.sh -h`.
 - `steps`: Steps to take for the specific scenearios. Please note that all steps above and the ones in this sample file `tests/e2e/testfiles/values.yaml` already have a backend implementation. If you desire to use a different step, see [Develop](#develop) for how to add new E2E Test
-- `customTest`: An array of entrypoints for users to run custom tests against their environment. There are two methods of running custom tests.
-  - You may have `"Run custom test"` as part of your `steps` above if there is *only one custom test in the array of tests*.
-  - You may have `"Run [Test Name]"`as part of your `steps` above to *select a custom test from the array by its name*
-
-  An object in this array has the following parameters:
+- `customTest`: An entrypoint for users to run custom test against their environment. You must have `"Run custom test"` as part of your `steps` above for this custom test to run. This object has the following parameter.
   - `name`: Name of your custom test
   - `run`: A list of command line arguments that will be run by the e2e test.
 

tests/e2e/array-info.sh

@@ -22,15 +22,6 @@ export PFLEX_ENDPOINT="10.1.1.1"
 export PFLEX_MDM="10.0.0.1,10.0.0.2"
 export PFLEX_NAS="none"
 export PFLEX_AUTH_ENDPOINT="localhost:9401"
-# an additional PFlex array is necessary for zoning tests
-export PFLEX_ZONING_USER="zoningUsername"
-export PFLEX_ZONING_PASS="zoningPassword"
-export PFLEX_ZONING_SYSTEMID="zoningSystemID"
-export PFLEX_ZONING_ENDPOINT="10.1.1.2"
-export PFLEX_ZONING_MDM="10.0.0.3,10.0.0.4"
-export PFLEX_ZONING_NAS="none"
-export PFLEX_ZONING_POOL="pool1"
-
 # The following are Authorization Proxy Server specific for powerflex:
 export PFLEX_POOL="pool1"
 export PFLEX_STORAGE="powerflex"

tests/e2e/e2e_test.go

@@ -96,7 +96,7 @@ func TestE2E(t *testing.T) {
 }
 
 var _ = BeforeSuite(func() {
-	tagEnvVars := []string{"NOMODULES", "AUTHORIZATION", "REPLICATION", "OBSERVABILITY", "AUTHORIZATIONPROXYSERVER", "RESILIENCY", "APPLICATIONMOBILITY", "POWERFLEX", "POWERSCALE", "POWERMAX", "POWERSTORE", "UNITY", "SANITY", "ZONING"}
+	tagEnvVars := []string{"NOMODULES", "AUTHORIZATION", "REPLICATION", "OBSERVABILITY", "AUTHORIZATIONPROXYSERVER", "RESILIENCY", "APPLICATIONMOBILITY", "POWERFLEX", "POWERSCALE", "POWERMAX", "POWERSTORE", "UNITY", "SANITY"}
 	By("Getting test environment variables")
 	valuesFile := os.Getenv(valuesFileEnvVar)
 	Expect(valuesFile).NotTo(BeEmpty(), "Missing environment variable required for tests. E2E_SCENARIOS_FILE must be set.")

tests/e2e/go.mod

@@ -6,8 +6,8 @@ toolchain go1.23.2
 
 require (
 	github.com/dell/csm-operator v0.0.0
-	github.com/onsi/ginkgo/v2 v2.22.0
-	github.com/onsi/gomega v1.36.0
+	github.com/onsi/ginkgo/v2 v2.20.2
+	github.com/onsi/gomega v1.34.2
 	golang.org/x/mod v0.22.0
 	k8s.io/api v0.31.3
 	k8s.io/apimachinery v0.31.3
@@ -49,7 +49,7 @@ require (
 	github.com/google/gnostic-models v0.6.9 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
+	github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
@@ -98,7 +98,7 @@ require (
 	golang.org/x/term v0.26.0 // indirect
 	golang.org/x/text v0.20.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.26.0 // indirect
+	golang.org/x/tools v0.24.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
 	google.golang.org/grpc v1.66.2 // indirect

tests/e2e/go.sum

@@ -77,8 +77,6 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA=
 github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
-github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo=
-github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
@@ -122,12 +120,8 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J
 github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
 github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
-github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg=
-github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
 github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
 github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
-github.com/onsi/gomega v1.36.0 h1:Pb12RlruUtj4XUuPUqeEWc6j5DkVVVA49Uf6YLfC95Y=
-github.com/onsi/gomega v1.36.0/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -254,8 +248,6 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
 golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
-golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ=
-golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

tests/e2e/run-e2e-test.sh

@@ -30,7 +30,6 @@ export REPLICATION=false
 export OBSERVABILITY=false
 export RESILIENCY=false
 export APPLICATIONMOBILITY=false
-export ZONING=false
 
 set -o errexit
 set -o nounset
@@ -170,7 +169,6 @@ function usage() {
   echo "  --pstore                                     use to run e2e powerstore suite"
   echo "  --unity                                      use to run e2e unity suite"
   echo "  --pmax                                       use to run e2e powermax suite"
-  echo "  --zoning                                     use to run powerflex zoning tests (requires multiple storage systems)"
   echo "  --minimal                                    use minimal testfiles scenarios"
   echo
 
@@ -217,8 +215,6 @@ while getopts ":hv-:" optchar; do
       export UNITY=true ;;
     pmax)
       export POWERMAX=true ;;
-    zoning)
-      export ZONING=true ;;
     cert-csi)
       CERT_CSI="${!OPTIND}"
       OPTIND=$((OPTIND + 1))

tests/e2e/steps/step_common.go

@@ -48,11 +48,11 @@ type CustomTest struct {
 
 // Scenario -
 type Scenario struct {
-	Scenario   string       `json:"scenario" yaml:"scenario"`
-	Paths      []string     `json:"paths" yaml:"paths"`
-	Tags       []string     `json:"tags" yaml:"tags"`
-	Steps      []string     `json:"steps" yaml:"steps"`
-	CustomTest []CustomTest `json:"customTest,omitempty" yaml:"customTest"`
+	Scenario   string     `json:"scenario" yaml:"scenario"`
+	Paths      []string   `json:"paths" yaml:"paths"`
+	Tags       []string   `json:"tags" yaml:"tags"`
+	Steps      []string   `json:"steps" yaml:"steps"`
+	CustomTest CustomTest `json:"customTest,omitempty" yaml:"customTest"`
 }
 
 // Resource -