From 6de438159fbdd197062c027b6188b4ac3fef0bbc Mon Sep 17 00:00:00 2001
From: ChristianAtDell <110482953+ChristianAtDell@users.noreply.github.com>
Date: Tue, 10 Dec 2024 15:05:35 -0600
Subject: [PATCH] Revert "Zoning E2E Test + E2E Improvements (#818)"

This reverts commit b734947fa55b05ff948ff2c4d1f75e760eeda137.
---
 tests/README.md                               |  26 +-
 tests/e2e/array-info.sh                       |   9 -
 tests/e2e/e2e_test.go                         |   2 +-
 tests/e2e/go.mod                              |   8 +-
 tests/e2e/go.sum                              |   8 -
 tests/e2e/modify_zoning_labels.sh             | 197 ------------
 tests/e2e/run-e2e-test.sh                     |   4 -
 tests/e2e/steps/step_common.go                |  10 +-
 tests/e2e/steps/steps_def.go                  |  98 +-----
 tests/e2e/steps/steps_runner.go               |   4 +-
 .../minimal-testfiles/scenarios.yaml          | 114 +++----
 .../powerflex-zoning-secret-template.yaml     |  20 --
 tests/e2e/testfiles/scenarios.yaml            | 283 ++++++++----------
 13 files changed, 210 insertions(+), 573 deletions(-)
 delete mode 100755 tests/e2e/modify_zoning_labels.sh
 delete mode 100644 tests/e2e/testfiles/powerflex-templates/powerflex-zoning-secret-template.yaml

diff --git a/tests/README.md b/tests/README.md
index a1976e763..c50522509 100644
--- a/tests/README.md
+++ b/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.
 
diff --git a/tests/e2e/array-info.sh b/tests/e2e/array-info.sh
index 446e71cf9..218444cf4 100644
--- a/tests/e2e/array-info.sh
+++ b/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"
diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
index 54b90741a..e0cf63b33 100644
--- a/tests/e2e/e2e_test.go
+++ b/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.")
diff --git a/tests/e2e/go.mod b/tests/e2e/go.mod
index a0af45a6d..014c15a08 100644
--- a/tests/e2e/go.mod
+++ b/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
diff --git a/tests/e2e/go.sum b/tests/e2e/go.sum
index 90519b2b8..477017f49 100644
--- a/tests/e2e/go.sum
+++ b/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=
diff --git a/tests/e2e/modify_zoning_labels.sh b/tests/e2e/modify_zoning_labels.sh
deleted file mode 100755
index 0d9e92522..000000000
--- a/tests/e2e/modify_zoning_labels.sh
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright © 2024 Dell Inc. or its subsidiaries. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#      http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#!/bin/bash
-
-# This script is used as a command line argument in the e2e CustomTest section. It will
-# add and remove zone labels for an e2e scenario.
-#
-# To add a zone label:
-# ./modify_zoning_labels.sh add <zone1> <zone2> ...
-# To remove a zone label:
-# ./modify_zoning_labels.sh remove <zone-key>
-# To remove all zone labels:
-# ./modify_zoning_labels.sh remove-all-zones
-# To validate the zone labels:
-# ./modify_zoning_labels.sh validate-zoning
-
-# get all worker node names in the cluster
-get_worker_nodes() {
-  kubectl get nodes -A | grep -v -E 'master|control-plane'  | grep -v NAME | awk '{ print $1 }'
-}
-
-# add zone label to all worker nodes
-add_zone_label() {
-  local zones=("$@")
-  local index=0
-  for node in $(get_worker_nodes); do
-    local zone=${zones[$index]}
-    if kubectl label nodes $node $zone; then
-      echo "Added zone label '$zone' to $node"
-    else
-      echo "Failed to add zone label '$zone' to $node"
-    fi
-
-    index=$((index + 1))
-    # reset the index if we reach the end of the zones array
-    if [ $index -ge ${#zones[@]} ]; then
-        index=0
-    fi
-  done
-}
-
-# remove a specific zone label from worker nodes
-remove_zone_label() {
-  local zone=$1
-  nodes=$(kubectl get nodes -l $zone -o name)
-  if [ -z "$nodes" ]; then
-    echo "No nodes found with zone '$zone'"
-    return
-  fi
-
-  for node in $(get_worker_nodes); do
-    if kubectl label nodes $node $zone-; then
-      echo "Removed label '$zone' from $node"
-    else
-      echo "Failed to remove label '$zone' from $node"
-    fi
-  done
-}
-
-# remove all labels from worker nodes starting with zone
-remove_all_zone_labels() {
-  for node in $(get_worker_nodes); do
-    labels=$(kubectl get node $node -o jsonpath='{.metadata.labels}' | jq -r 'keys[]')
-
-    for label in $labels; do
-    # this will remove all labels that start with "zone"
-    if [[ $label == zone* ]]; then
-        if kubectl label nodes $node $label-; then
-          echo "Removed label '$label' from $node"
-        else
-          echo "Failed to remove label '$label' from $node"
-        fi
-    fi
-    done
-  done
-}
-
-# validation part of script
-
-# read the Kubernetes secret and extract zone information
-read_secret() {
-  secret_name=$1
-  driverNamespace=$2
-  secret_data=$(kubectl get secret $secret_name -n $driverNamespace -o jsonpath='{.data.config}')
-  echo $secret_data | base64 --decode
-}
-
-# validating zoning is configured on the cluster
-validate_zoning() {
-  # read the secret and extract zone information
-  secret_name="test-vxflexos-config"
-  namespace="vxflexos"
-  secret_content=$(read_secret $secret_name $namespace)
-
-  # parse the secret content to extract zones
-  local zones=()
-  while IFS= read -r line; do
-    if [[ $line =~ name: ]]; then
-      zone=$(echo "${line##* }" | tr -d '"')
-      zones+=("$zone")
-    fi
-  done <<< "$(echo "$secret_content" | grep -A 1 'zone:' | grep 'name:')"
-  echo "$secret_content" | grep -A 1 'zone:' | grep 'name:'
-
-  echo "Configured zones in secret: ${zones[@]}"
-
-  # list all pods in the driver namespace
-  pods=$(kubectl get pods -n $namespace -o jsonpath='{.items[*].metadata.name}')
-
-  # create a map of pods and the nodes they're running on
-  declare -A pod_node_map
-  for pod in $pods; do
-    # check for running pods
-    status=$(kubectl get pod $pod -n $namespace -o jsonpath='{.status.phase}')
-    if [ "$status" == "Running" ]; then
-      # get the node name
-      node=$(kubectl get pod $pod -n $namespace -o jsonpath='{.spec.nodeName}')
-      pod_node_map[$pod]=$node
-    else
-      echo "Pod $pod is not running. Status: $status"
-      exit 1
-    fi
-  done
-
-  # query the nodes to ensure they have zone labels
-  for node in "${pod_node_map[@]}"; do
-    echo "Checking node: $node"
-    getLabel=$(kubectl get node $node -o jsonpath="{.metadata.labels}")
-    zone_label=$(echo "$getLabel" | jq -r '.["zone.csi-vxflexos.dellemc.com"]')
-
-    echo "Node $node zone label: $zone_label"
-
-    match_found=false
-    for zone in "${zones[@]}"; do
-      echo "Comparing node zone label '$zone_label' with expected zone '$zone'"
-      if [ "$zone" == "$zone_label" ]; then
-        match_found=true
-        echo "Node $node has a matching zone label: $zone_label"
-        break
-      fi
-    done
-
-    if [ "$match_found" == false ]; then
-      echo "Node $node does not have a matching zone label: $zone_label"
-      exit 1
-    fi
-  done
-}
-
-if [ "$#" -lt 1 ]; then
-  echo "Usage: $0 add <zone1> <zone2> ... | remove <label> | remove-all-zones | validate-zoning"
-  exit 1
-fi
-
-action=$1
-shift
-
-case $action in
-  add)
-    if [ "$#" -lt 1 ]; then
-      echo "Usage: $0 add <zone1> <zone2> ..."
-      exit 1
-    fi
-    add_zone_label "$@"
-    ;;
-  remove)
-    if [ "$#" -ne 1 ]; then
-      echo "Usage: $0 remove <zone>"
-      exit 1
-    fi
-    zone=$1
-    remove_zone_label $zone
-    ;;
-  remove-all-zones)
-    remove_all_zone_labels
-    ;;
-  validate-zoning)
-    validate_zoning
-    ;;
-  *)
-    echo "Invalid action: $action"
-    echo "Usage: $0 add <zone1> <zone2> ... | remove <label> | remove-all-zones | validate-zoning"
-    exit 1
-    ;;
-esac
-
-exit 0
diff --git a/tests/e2e/run-e2e-test.sh b/tests/e2e/run-e2e-test.sh
index 9af574c54..71f7edeb4 100755
--- a/tests/e2e/run-e2e-test.sh
+++ b/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))
diff --git a/tests/e2e/steps/step_common.go b/tests/e2e/steps/step_common.go
index 80e5eb0f5..0b8a57c11 100644
--- a/tests/e2e/steps/step_common.go
+++ b/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 -
diff --git a/tests/e2e/steps/steps_def.go b/tests/e2e/steps/steps_def.go
index 7d735eae9..9e2966231 100644
--- a/tests/e2e/steps/steps_def.go
+++ b/tests/e2e/steps/steps_def.go
@@ -25,7 +25,6 @@ import (
 	csmv1 "github.com/dell/csm-operator/api/v1"
 
 	"encoding/json"
-	"path/filepath"
 
 	"github.com/dell/csm-operator/pkg/constants"
 	"github.com/dell/csm-operator/pkg/modules"
@@ -40,6 +39,7 @@ import (
 	"k8s.io/kubernetes/test/e2e/framework/kubectl"
 	fpod "k8s.io/kubernetes/test/e2e/framework/pod"
 	"k8s.io/utils/pointer"
+	"path/filepath"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 )
@@ -51,11 +51,10 @@ const (
 )
 
 var (
-	authString        = "karavi-authorization-proxy"
-	operatorNamespace = "dell-csm-operator"
-	quotaLimit        = "100000000"
-	pflexSecretMap    = map[string]string{"REPLACE_USER": "PFLEX_USER", "REPLACE_PASS": "PFLEX_PASS", "REPLACE_SYSTEMID": "PFLEX_SYSTEMID", "REPLACE_ENDPOINT": "PFLEX_ENDPOINT", "REPLACE_MDM": "PFLEX_MDM", "REPLACE_POOL": "PFLEX_POOL", "REPLACE_NAS": "PFLEX_NAS",
-		"REPLACE_ZONING_USER": "PFLEX_ZONING_USER", "REPLACE_ZONING_PASS": "PFLEX_ZONING_PASS", "REPLACE_ZONING_SYSTEMID": "PFLEX_ZONING_SYSTEMID", "REPLACE_ZONING_ENDPOINT": "PFLEX_ZONING_ENDPOINT", "REPLACE_ZONING_MDM": "PFLEX_ZONING_MDM", "REPLACE_ZONING_POOL": "PFLEX_ZONING_POOL", "REPLACE_ZONING_NAS": "PFLEX_ZONING_NAS"}
+	authString               = "karavi-authorization-proxy"
+	operatorNamespace        = "dell-csm-operator"
+	quotaLimit               = "100000000"
+	pflexSecretMap           = map[string]string{"REPLACE_USER": "PFLEX_USER", "REPLACE_PASS": "PFLEX_PASS", "REPLACE_SYSTEMID": "PFLEX_SYSTEMID", "REPLACE_ENDPOINT": "PFLEX_ENDPOINT", "REPLACE_MDM": "PFLEX_MDM", "REPLACE_POOL": "PFLEX_POOL", "REPLACE_NAS": "PFLEX_NAS"}
 	pflexAuthSecretMap       = map[string]string{"REPLACE_USER": "PFLEX_USER", "REPLACE_SYSTEMID": "PFLEX_SYSTEMID", "REPLACE_ENDPOINT": "PFLEX_AUTH_ENDPOINT", "REPLACE_MDM": "PFLEX_MDM"}
 	pscaleSecretMap          = map[string]string{"REPLACE_CLUSTERNAME": "PSCALE_CLUSTER", "REPLACE_USER": "PSCALE_USER", "REPLACE_PASS": "PSCALE_PASS", "REPLACE_ENDPOINT": "PSCALE_ENDPOINT", "REPLACE_PORT": "PSCALE_PORT"}
 	pscaleAuthSecretMap      = map[string]string{"REPLACE_CLUSTERNAME": "PSCALE_CLUSTER", "REPLACE_USER": "PSCALE_USER", "REPLACE_PASS": "PSCALE_PASS", "REPLACE_AUTH_ENDPOINT": "PSCALE_AUTH_ENDPOINT", "REPLACE_AUTH_PORT": "PSCALE_AUTH_PORT", "REPLACE_ENDPOINT": "PSCALE_ENDPOINT", "REPLACE_PORT": "PSCALE_PORT"}
@@ -721,9 +720,6 @@ func (step *Step) setUpConfigMap(res Resource, templateFile, name, namespace, cr
 	return nil
 }
 
-// TODO: Tech debt.
-// We should refactor all of our template usages over time to use temporary files instead of editing in-line.
-// Once that's done, this method can be removed.
 func (step *Step) setUpSecret(res Resource, templateFile, name, namespace, crType string) error {
 	// find which map to use for secret values
 	mapValues, err := determineMap(crType)
@@ -756,46 +752,6 @@ func (step *Step) setUpSecret(res Resource, templateFile, name, namespace, crTyp
 	return nil
 }
 
-func (step *Step) setUpTempSecret(res Resource, templateFile, name, namespace, crType string) error {
-	// find which map to use for secret values
-	mapValues, err := determineMap(crType)
-	if err != nil {
-		return err
-	}
-
-	// read the template into memory
-	fileContent, err := os.ReadFile(templateFile)
-	if err != nil {
-		fmt.Println("Error reading file:", err)
-		return err
-	}
-
-	// Convert the file content to a string
-	fileString := string(fileContent)
-
-	// Replace all fields in temporary (in memory) string
-	for key := range mapValues {
-		fileString = strings.ReplaceAll(fileString, key, os.Getenv(mapValues[key]))
-	}
-
-	// if secret exists- delete it
-	if secretExists(namespace, name) {
-		err := execCommand("kubectl", "delete", "secret", "-n", namespace, name)
-		if err != nil {
-			return fmt.Errorf("failed to delete secret: %s", err.Error())
-		}
-	}
-
-	// create new secret
-	fileArg := "--from-literal=config=" + fileString
-	err = execCommand("kubectl", "create", "secret", "generic", "-n", namespace, name, fileArg)
-	if err != nil {
-		return fmt.Errorf("failed to create secret with template file: %s: %s", templateFile, err.Error())
-	}
-
-	return nil
-}
-
 func (step *Step) restoreTemplate(res Resource, templateFile, crType string) error {
 	mapValues, err := determineMap(crType)
 	if err != nil {
@@ -900,11 +856,8 @@ func (step *Step) runCustomTest(res Resource) error {
 		stderr string
 		err    error
 	)
-	if len(res.Scenario.CustomTest) != 1 {
-		return fmt.Errorf("'customTest' must be a single element array")
-	}
 
-	for testNum, customTest := range res.Scenario.CustomTest[0].Run {
+	for testNum, customTest := range res.Scenario.CustomTest.Run {
 		args := strings.Split(customTest, " ")
 		if len(args) == 1 {
 			stdout, stderr, err = framework.RunCmd(args[0])
@@ -920,45 +873,6 @@ func (step *Step) runCustomTest(res Resource) error {
 	return nil
 }
 
-func (step *Step) runCustomTestSelector(res Resource, testName string) error {
-	var (
-		stdout string
-		stderr string
-		err    error
-	)
-
-	// retrieve the appropriate test from the list of tests
-	var selectedTest CustomTest
-	foundTest := false
-	for _, test := range res.Scenario.CustomTest {
-		if test.Name == testName {
-			selectedTest = test
-			foundTest = true
-			break
-		}
-	}
-
-	if !foundTest {
-		return fmt.Errorf("custom test '%s' not found", testName)
-	}
-
-	for testNum, customTest := range selectedTest.Run {
-		args := strings.Split(customTest, " ")
-		if len(args) == 1 {
-			stdout, stderr, err = framework.RunCmd(args[0])
-		} else {
-			stdout, stderr, err = framework.RunCmd(args[0], args[1:]...)
-		}
-
-		if err != nil {
-			return fmt.Errorf("error running custom test #%d. Error: %v \n stdout: %s \n stderr: %s", testNum, err, stdout, stderr)
-		}
-	}
-
-	return nil
-
-}
-
 func (step *Step) setupEphemeralVolumeProperties(res Resource, templateFile string, crType string) error {
 	mapValues, err := determineMap(crType)
 	if err != nil {
diff --git a/tests/e2e/steps/steps_runner.go b/tests/e2e/steps/steps_runner.go
index 6acf51239..db4a9c86b 100644
--- a/tests/e2e/steps/steps_runner.go
+++ b/tests/e2e/steps/steps_runner.go
@@ -49,8 +49,7 @@ func StepRunnerInit(runner *Runner, ctrlClient client.Client, clientSet *kuberne
 	runner.addStep(`^Validate \[([^"]*)\] driver from CR \[(\d+)\] is installed$`, step.validateDriverInstalled)
 	runner.addStep(`^Validate \[([^"]*)\] driver from CR \[(\d+)\] is not installed$`, step.validateDriverNotInstalled)
 
-	runner.addStep(`^Run custom test$`, step.runCustomTest)         // legacy support - original e2e was designed only to run ONE custom test
-	runner.addStep(`^Run \[([^"]*)\]$`, step.runCustomTestSelector) // support for multiple custom tests
+	runner.addStep(`^Run custom test$`, step.runCustomTest)
 	runner.addStep(`^Enable forceRemoveDriver on CR \[(\d+)\]$`, step.enableForceRemoveDriver)
 	runner.addStep(`^Enable forceRemoveModule on CR \[(\d+)\]$`, step.enableForceRemoveModule)
 	runner.addStep(`^Delete custom resource \[(\d+)\]$`, step.deleteCustomResource)
@@ -67,7 +66,6 @@ func StepRunnerInit(runner *Runner, ctrlClient client.Client, clientSet *kuberne
 	runner.addStep(`^Set up secret from \[([^"]*)\] in namespace \[([^"]*)\]`, step.setupSecretFromFile)
 	runner.addStep(`^Set secret for driver from CR \[(\d+)\] to \[([^"]*)\]$`, step.setDriverSecret)
 	runner.addStep(`^Set up secret with template \[([^"]*)\] name \[([^"]*)\] in namespace \[([^"]*)\] for \[([^"]*)\]`, step.setUpSecret)
-	runner.addStep(`^Set up temporary secret with template \[([^"]*)\] name \[([^"]*)\] in namespace \[([^"]*)\] for \[([^"]*)\]`, step.setUpTempSecret)
 	runner.addStep(`^Set up configMap with template \[([^"]*)\] name \[([^"]*)\] in namespace \[([^"]*)\] for \[([^"]*)\]`, step.setUpConfigMap)
 	runner.addStep(`^Set up creds with template \[([^"]*)\] for \[([^"]*)\]`, step.setUpPowermaxCreds)
 	runner.addStep(`^Restore template \[([^"]*)\] for \[([^"]*)\]`, step.restoreTemplate)
diff --git a/tests/e2e/testfiles/minimal-testfiles/scenarios.yaml b/tests/e2e/testfiles/minimal-testfiles/scenarios.yaml
index b051091b7..18c275024 100644
--- a/tests/e2e/testfiles/minimal-testfiles/scenarios.yaml
+++ b/tests/e2e/testfiles/minimal-testfiles/scenarios.yaml
@@ -19,9 +19,9 @@
     - "Restore template [testfiles/powerstore-templates/powerstore-secret-template.yaml] for [pstore]"
     - "Restore template [testfiles/powerstore-templates/powerstore-storageclass-template.yaml] for [pstore]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-pstore --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-pstore --chainNumber 2 --chainLength 2
 
 - scenario: "Install PowerStore Driver (Minimal, With Resiliency)"
   paths:
@@ -44,9 +44,9 @@
     - "Restore template [testfiles/powerstore-templates/powerstore-secret-template.yaml] for [pstore]"
     - "Restore template [testfiles/powerstore-templates/powerstore-storageclass-template.yaml] for [pstore]"
   customTest:
-    - name: CustomTest
-      run:
-        - echo "no current test for resiliency"
+    name: CustomTest
+    run:
+      - echo "no current test for resiliency"
 
 - scenario: "Install PowerStore Driver (Minimal, Standalone), Enable Resiliency"
   paths:
@@ -93,9 +93,9 @@
     - "Restore template [testfiles/unity-templates/unity-secret-template.yaml] for [unity]"
     - "Restore template [testfiles/unity-templates/unity-storageclass-template.yaml] for [unity]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-unity --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-unity --chainNumber 2 --chainLength 2
 
 - scenario: "Install PowerFlex Driver (Minimal, Standalone)"
   paths:
@@ -117,9 +117,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
 
 - scenario: "Install PowerFlex Driver (Minimal, With Resiliency)"
   paths:
@@ -140,9 +140,9 @@
     - "Enable forceRemoveDriver on CR [1]"
     - "Delete custom resource [1]"
   customTest:
-    - name: CustomTest
-      run:
-        - echo "no current test for resiliency"
+    name: CustomTest
+    run:
+      - echo "no current test for resiliency"
 - scenario: "Install PowerFlex Driver (Minimal, Standalone), Enable/Disable Resiliency"
   paths:
     - "testfiles/minimal-testfiles/storage_csm_powerflex.yaml"
@@ -202,9 +202,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflexAuth]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
 
 - scenario: "Install PowerFlex Driver (Minimal, With Authorization V1)"
   paths:
@@ -237,9 +237,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
     - "Restore template [testfiles/powerflex-templates/csm-authorization-config.json] for [pflexAuthSidecar]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
 - scenario: "Install PowerFlex Driver (Minimal, With Observability)"
   paths:
     - "testfiles/minimal-testfiles/storage_csm_powerflex_observability.yaml"
@@ -260,9 +260,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
 - scenario: "Install PowerFlex Driver (Minimal, With Observability and Custom Cert for Otel-Collector)"
   paths:
     - "testfiles/minimal-testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml"
@@ -300,9 +300,9 @@
     - "Restore template [testfiles/powerscale-templates/powerscale-secret-template.yaml] for [pscale]"
     - "Restore template [testfiles/powerscale-templates/powerscale-storageclass-template.yaml] for [pscale]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
 
 - scenario: "Install PowerScale Driver (Minimal, Standalone), Enable/Disable Resiliency"
   paths:
@@ -348,9 +348,9 @@
     - "Delete custom resource [1]"
     - "Restore template [testfiles/powerscale-templates/powerscale-secret-template.yaml] for [pscale]"
   customTest:
-    - name: CustomTest
-      run:
-        - echo "no current test for resiliency"
+    name: CustomTest
+    run:
+      - echo "no current test for resiliency"
 
 - scenario: "Install PowerScale Driver (Minimal, With Replication)"
   paths:
@@ -371,9 +371,9 @@
     - "Enable forceRemoveDriver on CR [1]"
     - "Delete custom resource [1]"
   customTest:
-    - name: HelloWorld
-      run:
-        - echo "no current test implemented for replication"
+    name: HelloWorld
+    run:
+      - echo "no current test implemented for replication"
 
 - scenario: "Install PowerScale Driver (Minimal, Standalone), Enable/Disable Replication"
   paths:
@@ -401,9 +401,9 @@
     - "Enable forceRemoveDriver on CR [2]"
     - "Delete custom resource [2]"
   customTest:
-    - name: HelloWorld
-      run:
-        - echo "no current test implemented for replication"
+    name: HelloWorld
+    run:
+      - echo "no current test implemented for replication"
 
 - scenario: "Uninstall PowerScale Driver (Minimal)"
   paths:
@@ -497,9 +497,9 @@
     - "Restore template [testfiles/powerscale-templates/powerscale-auth-secret-template.yaml] for [pscaleAuth]"
     - "Restore template [testfiles/powerscale-templates/karavi-authorization-config.json] for [pscaleAuthSidecar]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
 
 - scenario: "Install PowerScale Driver (Minimal), Enable/Disable Authorization V1 module"
   paths:
@@ -576,9 +576,9 @@
     - "Restore template [testfiles/powerscale-templates/powerscale-auth-secret-template.yaml] for [pscaleAuth]"
     - "Restore template [testfiles/powerscale-templates/karavi-authorization-config.json] for [pscaleAuthSidecar]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
 
 - scenario: "Install Powerflex Driver (Minimal, With Replication)"
   paths:
@@ -601,9 +601,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: HelloWorld
-      run:
-        - echo "no current test implemented for replication"
+    name: HelloWorld
+    run:
+      - echo "no current test implemented for replication"
 
 - scenario: "Install PowerMax Driver (Minimal, Standalone)"
   paths:
@@ -625,9 +625,9 @@
     - "Restore template [testfiles/powermax-templates/powermax-storageclass-template.yaml] for [pmax]"
     - "Restore template [testfiles/powermax-templates/powermax-secret-template.yaml] for [pmaxCreds]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-pmax --chainLength 1 --chainNumber 1
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-pmax --chainLength 1 --chainNumber 1
 
 - scenario: "Install PowerMax Driver (Minimal, With Observability)"
   paths:
@@ -682,9 +682,9 @@
     - "Restore template [testfiles/powermax-templates/powermax-secret-template.yaml] for [pmaxCreds]"
     - "Restore template [testfiles/powermax-templates/powermax_reverse_proxy_config_auth.yaml] for [pmaxReverseProxy]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-pmax  --chainLength 1 --chainNumber 1
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-pmax  --chainLength 1 --chainNumber 1
 
 - scenario: "Install Powermax Driver (Minimal, With Authorization v2)"
   paths:
@@ -723,9 +723,9 @@
     - "Restore template [testfiles/powermax-templates/powermax-storageclass-template.yaml] for [pmax]"
     - "Restore template [testfiles/powermax-templates/powermax-array-config.yaml] for [pmaxArrayConfig]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-pmax  --chainLength 1 --chainNumber 1
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-pmax  --chainLength 1 --chainNumber 1
 
 
 - scenario: "Install Powermax Driver (Minimal, Standalone), Enable Resiliency"
@@ -801,6 +801,6 @@
     - "Restore template [testfiles/powermax-templates/powermax-storageclass-template.yaml] for [pmax]"
     - "Restore template [testfiles/powermax-templates/powermax-secret-template.yaml] for [pmaxCreds]"
   customTest:
-    - name: HelloWorld
-      run:
-        - echo "no current test implemented for replication"
+    name: HelloWorld
+    run:
+      - echo "no current test implemented for replication"
diff --git a/tests/e2e/testfiles/powerflex-templates/powerflex-zoning-secret-template.yaml b/tests/e2e/testfiles/powerflex-templates/powerflex-zoning-secret-template.yaml
deleted file mode 100644
index e653c318c..000000000
--- a/tests/e2e/testfiles/powerflex-templates/powerflex-zoning-secret-template.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-- username: REPLACE_USER
-  password: REPLACE_PASS
-  systemID: REPLACE_SYSTEMID
-  endpoint: https://REPLACE_ENDPOINT
-  skipCertificateValidation: true
-  isDefault: true
-  mdm: REPLACE_MDM
-  zone:
-    name: "zoneA"
-    labelKey: "zone.csi-vxflexos.dellemc.com"
-- username: REPLACE_ZONING_USER
-  password: REPLACE_ZONING_PASS
-  systemID: REPLACE_ZONING_SYSTEMID
-  endpoint: https://REPLACE_ZONING_ENDPOINT
-  skipCertificateValidation: true
-  isDefault: false
-  mdm: REPLACE_ZONING_MDM
-  zone:
-    name: "zoneB"
-    labelKey: "zone.csi-vxflexos.dellemc.com"
diff --git a/tests/e2e/testfiles/scenarios.yaml b/tests/e2e/testfiles/scenarios.yaml
index 515ead793..0aacaefd1 100644
--- a/tests/e2e/testfiles/scenarios.yaml
+++ b/tests/e2e/testfiles/scenarios.yaml
@@ -164,9 +164,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflexAuth]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
 - scenario: "Install PowerScale Driver(Standalone)"
   paths:
     - "testfiles/storage_csm_powerscale.yaml"
@@ -189,10 +189,10 @@
     - "Restore template [testfiles/powerscale-templates/powerscale-storageclass-template.yaml] for [pscale]"
     - "Restore template [testfiles/powerscale-templates/ephemeral.properties] for [pscaleEphemeral]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
-        - cert-csi test ephemeral-volume --pods 1 --driver csi-isilon.dellemc.com --attr testfiles/powerscale-templates/ephemeral.properties
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
+      - cert-csi test ephemeral-volume --pods 1 --driver csi-isilon.dellemc.com --attr testfiles/powerscale-templates/ephemeral.properties
 - scenario: "Install PowerScale Driver with first alternate sample file"
   paths:
     - "testfiles/storage_csm_powerscale_alt_vals_1.yaml"
@@ -212,9 +212,9 @@
     - "Restore template [testfiles/powerscale-templates/powerscale-secret-template.yaml] for [pscale]"
     - "Restore template [testfiles/powerscale-templates/powerscale-storageclass-template-altifs.yaml] for [pscale]"
   customTest:
-    - name: check_parameters.sh
-      run:
-        - /bin/bash check_parameters.sh testfiles/powerscale_alt_vals_1_values.csv dell powerscale
+    name: check_parameters.sh
+    run:
+      - /bin/bash check_parameters.sh testfiles/powerscale_alt_vals_1_values.csv dell powerscale
 - scenario: "Install PowerScale Driver with second alternate sample file"
   paths:
     - "testfiles/storage_csm_powerscale_alt_vals_2.yaml"
@@ -234,9 +234,9 @@
     - "Restore template [testfiles/powerscale-templates/powerscale-secret-template.yaml] for [pscale]"
     - "Restore template [testfiles/powerscale-templates/powerscale-storageclass-template.yaml] for [pscale]"
   customTest:
-    - name: check_parameters.sh
-      run:
-        - /bin/bash check_parameters.sh testfiles/powerscale_alt_vals_2_values.csv dell powerscale
+    name: check_parameters.sh
+    run:
+      - /bin/bash check_parameters.sh testfiles/powerscale_alt_vals_2_values.csv dell powerscale
 - scenario: "Install PowerScale Driver with third alternate sample file"
   paths:
     - "testfiles/storage_csm_powerscale_alt_vals_3.yaml"
@@ -258,9 +258,9 @@
     - "Restore template [testfiles/powerscale-templates/powerscale-secret-template.yaml] for [pscale]"
     - "Restore template [testfiles/powerscale-templates/powerscale-storageclass-template.yaml] for [pscale]"
   customTest:
-    - name: check_parameters.sh
-      run:
-        - /bin/bash check_parameters.sh testfiles/powerscale_alt_vals_3_values.csv dell powerscale
+    name: check_parameters.sh
+    run:
+      - /bin/bash check_parameters.sh testfiles/powerscale_alt_vals_3_values.csv dell powerscale
 - scenario: "Install PowerScale Driver with health monitor"
   paths:
     - "testfiles/storage_csm_powerscale_health_monitor.yaml"
@@ -275,17 +275,16 @@
     - "Validate custom resource [1]"
     - "Validate [powerscale] driver from CR [1] is installed"
     - "Run custom test"
-    - "Run [Cert CSI and check_parameters.sh]"
     # cleanup
     - "Enable forceRemoveDriver on CR [1]"
     - "Delete custom resource [1]"
     - "Restore template [testfiles/powerscale-templates/powerscale-secret-template.yaml] for [pscale]"
     - "Restore template [testfiles/powerscale-templates/powerscale-storageclass-template.yaml] for [pscale]"
   customTest:
-    - name: Cert CSI and check_parameters.sh
-      run:
-        - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
-        - /bin/bash check_parameters.sh testfiles/powerscale_health_monitor_values.csv dell powerscale
+    name: Cert CSI and check_parameters.sh
+    run:
+      - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
+      - /bin/bash check_parameters.sh testfiles/powerscale_health_monitor_values.csv dell powerscale
 - scenario: "Install PowerScale Driver(With Authorization V1)"
   paths:
     - "testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server_no_cert.yaml"
@@ -316,9 +315,9 @@
     - "Restore template [testfiles/powerscale-templates/powerscale-auth-secret-template.yaml] for [pscaleAuth]"
     - "Restore template [testfiles/powerscale-templates/karavi-authorization-config.json] for [pscaleAuthSidecar]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
 - scenario: "Install PowerScale Driver(With Replication)"
   paths:
     - "testfiles/storage_csm_powerscale_replica.yaml"
@@ -338,9 +337,9 @@
     - "Enable forceRemoveDriver on CR [1]"
     - "Delete custom resource [1]"
   customTest:
-    - name: HelloWorld
-      run:
-        - echo "no current test implemented for replication"
+    name: HelloWorld
+    run:
+      - echo "no current test implemented for replication"
 - scenario: "Install PowerScale Driver(Standalone), Enable/Disable Replication"
   paths:
     - "testfiles/storage_csm_powerscale.yaml"
@@ -367,9 +366,9 @@
     - "Enable forceRemoveDriver on CR [2]"
     - "Delete custom resource [2]"
   customTest:
-    - name: HelloWorld
-      run:
-        - echo "no current test implemented for replication"
+    name: HelloWorld
+    run:
+      - echo "no current test implemented for replication"
 - scenario: "Uninstall PowerScale Driver"
   paths:
     - "testfiles/storage_csm_powerscale.yaml"
@@ -446,9 +445,9 @@
     - "Restore template [testfiles/powerscale-templates/powerscale-secret-template.yaml] for [pscale]"
     - "Restore template [testfiles/powerscale-templates/powerscale-storageclass-template.yaml] for [pscale]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
 - scenario: "Install PowerScale Driver(Standalone), Enable/Disable Observability"
   paths:
     - "testfiles/storage_csm_powerscale.yaml"
@@ -526,9 +525,9 @@
     - "Restore template [testfiles/powerscale-templates/karavi-authorization-config.json] for [pscaleAuthSidecar]"
     - "Restore template [testfiles/authorization-templates/rootCertificate.pem] for [authSidecarCert]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
 - scenario: "Install PowerScale Driver(Standalone), Enable Authorization V1, Enable Observability"
   paths:
     - "testfiles/authorization-templates/storage_csm_authorization_v1_proxy_server_no_cert.yaml"
@@ -616,9 +615,9 @@
     - "Restore template [testfiles/authorization-templates/rootCertificate.pem] for [authSidecarCert]"
     - "Restore template [testfiles/powerscale-templates/powerscale-secret-template.yaml] for [pscale]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
 - scenario: "Install PowerFlex Driver(Standalone)"
   paths:
     - "testfiles/storage_csm_powerflex.yaml"
@@ -641,10 +640,10 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
     - "Restore template [testfiles/powerflex-templates/ephemeral.properties] for [pflexEphemeral]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
-        - cert-csi test ephemeral-volume --pods 1 --driver csi-vxflexos.dellemc.com --attr testfiles/powerflex-templates/ephemeral.properties
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
+      - cert-csi test ephemeral-volume --pods 1 --driver csi-vxflexos.dellemc.com --attr testfiles/powerflex-templates/ephemeral.properties
 - scenario: "Install PowerFlex Driver with first set of alternate values"
   paths:
     - "testfiles/storage_csm_powerflex_alt_vals_1.yaml"
@@ -667,9 +666,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: check_parameters.sh
-      run:
-        - /bin/bash check_parameters.sh testfiles/powerflex_alt_vals_1_values.csv dell powerflex
+    name: check_parameters.sh
+    run:
+      - /bin/bash check_parameters.sh testfiles/powerflex_alt_vals_1_values.csv dell powerflex
 - scenario: "Install PowerFlex Driver with second set of alternate values"
   paths:
     - "testfiles/storage_csm_powerflex_alt_vals_2.yaml"
@@ -689,9 +688,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: check_parameters.sh
-      run:
-        - /bin/bash check_parameters.sh testfiles/powerflex_alt_vals_2_values.csv dell powerflex
+    name: check_parameters.sh
+    run:
+      - /bin/bash check_parameters.sh testfiles/powerflex_alt_vals_2_values.csv dell powerflex
 - scenario: "Install PowerFlex Driver with third set of alternate values"
   paths:
     - "testfiles/storage_csm_powerflex_alt_vals_3.yaml"
@@ -713,9 +712,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: check_parameters.sh
-      run:
-        - /bin/bash check_parameters.sh testfiles/powerflex_alt_vals_3_values.csv dell powerflex
+    name: check_parameters.sh
+    run:
+      - /bin/bash check_parameters.sh testfiles/powerflex_alt_vals_3_values.csv dell powerflex
 - scenario: "Install PowerFlex Driver with fourth set of alternate values"
   paths:
     - "testfiles/storage_csm_powerflex_alt_vals_4.yaml"
@@ -735,9 +734,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: check_parameters.sh
-      run:
-        - /bin/bash check_parameters.sh testfiles/powerflex_alt_vals_4_values.csv dell powerflex
+    name: check_parameters.sh
+    run:
+      - /bin/bash check_parameters.sh testfiles/powerflex_alt_vals_4_values.csv dell powerflex
 - scenario: "Install PowerFlex Driver without SDC"
   paths:
     - "testfiles/storage_csm_powerflex_no_sdc.yaml"
@@ -757,9 +756,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: check_parameters.sh
-      run:
-        - /bin/bash check_parameters.sh testfiles/powerflex_no_sdc_values.csv dell powerflex
+    name: check_parameters.sh
+    run:
+      - /bin/bash check_parameters.sh testfiles/powerflex_no_sdc_values.csv dell powerflex
 - scenario: "Install PowerFlex Driver with health monitor"
   paths:
     - "testfiles/storage_csm_powerflex_health_monitor.yaml"
@@ -779,10 +778,10 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: Cert CSI and check_parameters.sh
-      run:
-        - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
-        - /bin/bash check_parameters.sh testfiles/powerflex_alt_vals_5_values.csv dell powerflex
+    name: Cert CSI and check_parameters.sh
+    run:
+      - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
+      - /bin/bash check_parameters.sh testfiles/powerflex_alt_vals_5_values.csv dell powerflex
 - scenario: "Uninstall PowerFlex Driver"
   paths:
     - "testfiles/storage_csm_powerflex.yaml"
@@ -832,9 +831,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflexAuth]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
 - scenario: "Install PowerScale Driver (With Authorization V2)"
   paths:
     - "testfiles/authorization-templates/storage_csm_authorization_v2_proxy_server.yaml"
@@ -868,9 +867,9 @@
     - "Restore template [testfiles/powerscale-templates/powerscale-auth-secret-template.yaml] for [pscaleAuth]"
     - "Restore template [testfiles/powerscale-templates/karavi-authorization-config.json] for [pscaleAuthSidecar]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
 - scenario: "Install PowerScale Driver(With Authorization V2 and Observability)"
   paths:
     - "testfiles/authorization-templates/storage_csm_authorization_v2_proxy_server.yaml"
@@ -907,9 +906,9 @@
     - "Restore template [testfiles/powerscale-templates/powerscale-auth-secret-template.yaml] for [pscaleAuth]"
     - "Restore template [testfiles/powerscale-templates/karavi-authorization-config.json] for [pscaleAuthSidecar]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-isilon --chainNumber 2 --chainLength 2
 - scenario: Install PowerScale Driver(With Authorization V2 and Observability), Disable Observability module, Disable Authorization module"
   paths:
     - "testfiles/authorization-templates/storage_csm_authorization_v2_proxy_server.yaml"
@@ -998,9 +997,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflexAuth]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
 - scenario: "Install PowerFlex Driver, Downgrade driver to supported version"
   paths:
     - "testfiles/storage_csm_powerflex.yaml"
@@ -1047,9 +1046,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
 - scenario: "Install PowerFlex Driver(With Observability and Custom Certs)"
   paths:
     - "testfiles/storage_csm_powerflex_observability_custom_cert.yaml"
@@ -1131,9 +1130,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]"
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
   customTest:
-    - name: HelloWorld
-      run:
-        - echo "no current test implemented for replication"
+    name: HelloWorld
+    run:
+      - echo "no current test implemented for replication"
 - scenario: "Install Powerflex Driver (Standalone), Enable/Disable Replication"
   paths:
     - "testfiles/storage_csm_powerflex.yaml"
@@ -1232,9 +1231,9 @@
     - "Restore template [testfiles/powerflex-templates/powerflex-storageclass-template.yaml] for [pflex]"
     - "Restore template [testfiles/powerflex-templates/csm-authorization-config.json] for [pflexAuthSidecar]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-vxflexos --chainNumber 2 --chainLength 2
 - scenario: Install PowerFlex Driver(With Authorization V2 and Observability), Disable Observability module, Disable Authorization module"
   paths:
     - "testfiles/authorization-templates/storage_csm_authorization_v2_proxy_server.yaml"
@@ -1299,9 +1298,9 @@
     - "Delete custom resource [1]"
     - "Restore template [testfiles/powerflex-templates/powerflex-secret-template.yaml] for [pflex]"
   customTest:
-    - name: CustomTest
-      run:
-        - echo "no current test for resiliency"
+    name: CustomTest
+    run:
+      - echo "no current test for resiliency"
 - scenario: "Install PowerFlex Driver(Standalone), Enable/Disable Resiliency"
   paths:
     - "testfiles/storage_csm_powerflex.yaml"
@@ -1344,9 +1343,9 @@
     - "Delete custom resource [1]"
     - "Restore template [testfiles/powerscale-templates/powerscale-secret-template.yaml] for [pscale]"
   customTest:
-    - name: CustomTest
-      run:
-        - echo "no current test for resiliency"
+    name: CustomTest
+    run:
+      - echo "no current test for resiliency"
 - scenario: "Install PowerScale Driver(Standalone), Enable/Disable Resiliency"
   paths:
     - "testfiles/storage_csm_powerscale.yaml"
@@ -1420,10 +1419,10 @@
     - "Restore template [testfiles/powerstore-templates/powerstore-storageclass-template.yaml] for [pstore]"
     - "Restore template [testfiles/powerstore-templates/ephemeral.properties] for [pstoreEphemeral]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-pstore --chainNumber 2 --chainLength 2
-        - cert-csi test ephemeral-volume --pods 1 --driver csi-powerstore.dellemc.com --attr testfiles/powerstore-templates/ephemeral.properties
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-pstore --chainNumber 2 --chainLength 2
+      - cert-csi test ephemeral-volume --pods 1 --driver csi-powerstore.dellemc.com --attr testfiles/powerstore-templates/ephemeral.properties
 - scenario: "Install PowerStore Driver(With Resiliency)"
   paths:
     - "testfiles/storage_csm_powerstore_resiliency.yaml"
@@ -1445,9 +1444,9 @@
     - "Restore template [testfiles/powerstore-templates/powerstore-secret-template.yaml] for [pstore]"
     - "Restore template [testfiles/powerstore-templates/powerstore-storageclass-template.yaml] for [pstore]"
   customTest:
-    - name: CustomTest
-      run:
-        - echo "no current test for resiliency"
+    name: CustomTest
+    run:
+      - echo "no current test for resiliency"
 - scenario: "Install PowerStore Driver(Standalone), Enable Resiliency"
   paths:
     - "testfiles/storage_csm_powerstore.yaml"
@@ -1495,10 +1494,10 @@
     - "Restore template [testfiles/unity-templates/unity-storageclass-template.yaml] for [unity]"
     - "Restore template [testfiles/unity-templates/ephemeral.properties] for [unityEphemeral]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-unity --chainNumber 2 --chainLength 2
-        - cert-csi test ephemeral-volume --pods 1 --driver csi-unity.dellemc.com --attr testfiles/unity-templates/ephemeral.properties
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-unity --chainNumber 2 --chainLength 2
+      - cert-csi test ephemeral-volume --pods 1 --driver csi-unity.dellemc.com --attr testfiles/unity-templates/ephemeral.properties
 - scenario: "Install App Mobility (Standalone)"
   paths:
     - "testfiles/application-mobility-templates/csm_application_mobility_vanilla.yaml"
@@ -1538,9 +1537,9 @@
     - "Delete custom resource [2]"
     - "Delete custom resource [1]"
   customTest:
-    - name: verify app-mobility
-      run:
-        - /bin/bash verify-app-mobility.sh
+    name: verify app-mobility
+    run:
+      - /bin/bash verify-app-mobility.sh
 - scenario: "Install powerflex driver, enable and disable application-mobility"
   paths:
     - "testfiles/application-mobility-templates/powerflex_noAM.yaml"
@@ -1625,9 +1624,9 @@
     - "Enable forceRemoveModule on CR [1]"
     - "Delete custom resource [1]"
   customTest:
-    - name: verify app-mobility
-      run:
-        - /bin/bash verify-app-mobility.sh
+    name: verify app-mobility
+    run:
+      - /bin/bash verify-app-mobility.sh
 - scenario: "Install App Mobility Velero with different env variables than default"
   paths:
     - "testfiles/application-mobility-templates/alt-velero-secret.yaml"
@@ -1657,9 +1656,9 @@
     - "Delete custom resource [1]"
     - "Delete custom resource [2]"
   customTest:
-    - name: verify app-mobility
-      run:
-        - /bin/bash verify-app-mobility.sh
+    name: verify app-mobility
+    run:
+      - /bin/bash verify-app-mobility.sh
 - scenario: "Install App Mobility with powerflex driver- default"
   paths:
     - "testfiles/application-mobility-templates/csm_application_mobility_with_pflex.yaml"
@@ -1683,9 +1682,9 @@
     - "Enable forceRemoveModule on CR [1]"
     - "Delete custom resource [1]"
   customTest:
-    - name: verify app-mobility
-      run:
-        - /bin/bash verify-app-mobility.sh
+    name: verify app-mobility
+    run:
+      - /bin/bash verify-app-mobility.sh
 
 - scenario: "Install PowerMax Driver(Standalone)"
   paths:
@@ -1710,9 +1709,9 @@
     - "Restore template [testfiles/powermax-templates/powermax-secret-template.yaml] for [pmaxCreds]"
     - "Restore template [testfiles/powermax-templates/powermax-array-config.yaml] for [pmaxArrayConfig]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-pmax --chainLength 1 --chainNumber 1
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-pmax --chainLength 1 --chainNumber 1
 
 - scenario: "Install PowerMax Driver(Sidecar)"
   paths:
@@ -1738,9 +1737,9 @@
     - "Restore template [testfiles/powermax-templates/powermax-secret-template.yaml] for [pmaxCreds]"
     - "Restore template [testfiles/powermax-templates/powermax-array-config.yaml] for [pmaxArrayConfig]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-pmax --chainLength 1 --chainNumber 1
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-pmax --chainLength 1 --chainNumber 1
 
 - scenario: "Install PowerMax Driver(With Observability)"
   paths:
@@ -1797,9 +1796,9 @@
     - "Restore template [testfiles/powermax-templates/powermax-secret-template.yaml] for [pmaxCreds]"
     - "Restore template [testfiles/powermax-templates/powermax_reverse_proxy_config_auth.yaml] for [pmaxReverseProxy]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-pmax  --chainLength 1 --chainNumber 1
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-pmax  --chainLength 1 --chainNumber 1
 
 - scenario: "Install Powermax Driver (With Authorization v2)"
   paths:
@@ -1839,9 +1838,9 @@
     - "Restore template [testfiles/powermax-templates/powermax-storageclass-template.yaml] for [pmax]"
     - "Restore template [testfiles/powermax-templates/powermax-array-config.yaml] for [pmaxAuthArrayConfig]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-pmax  --chainLength 1 --chainNumber 1
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-pmax  --chainLength 1 --chainNumber 1
 
 - scenario: "Install Powermax Driver (With Authorization v2 and Observability)"
   paths:
@@ -1885,9 +1884,9 @@
     - "Restore template [testfiles/powermax-templates/powermax-storageclass-template.yaml] for [pmax]"
     - "Restore template [testfiles/powermax-templates/powermax-array-config.yaml] for [pmaxAuthArrayConfig]"
   customTest:
-    - name: Cert CSI
-      run:
-        - cert-csi test vio --sc op-e2e-pmax  --chainLength 1 --chainNumber 1
+    name: Cert CSI
+    run:
+      - cert-csi test vio --sc op-e2e-pmax  --chainLength 1 --chainNumber 1
 
 - scenario: "Install Powermax Driver(Standalone), Enable Resiliency"
   paths:
@@ -1940,33 +1939,3 @@
     - "Restore template [testfiles/powermax-templates/powermax_reverse_proxy_config.yaml] for [pmaxAuthSidecar]"
     - "Restore template [testfiles/powermax-templates/powermax-storageclass-template.yaml] for [pmax]"
     - "Restore template [testfiles/powermax-templates/powermax-secret-template.yaml] for [pmaxCreds]"
-
-- scenario: "Install PowerFlex Driver (Standalone) With Node Zoning"
-  paths:
-    - "testfiles/storage_csm_powerflex.yaml"
-  tags:
-    - "zoning"
-  steps:
-    - "Given an environment with k8s or openshift, and CSM operator installed"
-    - "Run [Apply Node Labels]"
-    - "Set up temporary secret with template [testfiles/powerflex-templates/powerflex-zoning-secret-template.yaml] name [test-vxflexos-config] in namespace [test-vxflexos] for [pflex]"
-    - "Apply custom resource [1]"
-    - "Validate [powerflex] driver from CR [1] is installed"
-    - "Run [Validate Node Labels]"
-    # cleanup
-    - "Enable forceRemoveDriver on CR [1]"
-    - "Delete custom resource [1]"
-    - "Run [Remove Node Labels]"
-  customTest:
-    - name: Apply Node Labels
-      run:
-        - kubectl get nodes --show-labels
-        - /bin/bash modify_zoning_labels.sh add zone.csi-vxflexos.dellemc.com=zoneA zone.csi-vxflexos.dellemc.com=zoneB
-        - kubectl get nodes --show-labels
-    - name: Validate Node Labels
-      run:
-        - /bin/bash modify_zoning_labels.sh validate-zoning
-    - name: Remove Node Labels
-      run:
-        - /bin/bash modify_zoning_labels.sh remove-all-zones
-        - kubectl get nodes --show-labels