Remove snapshot class from prepv test because it is not needed.

Prepv snapshots only need to specify driver.
openshift · Feb 19, 2021 · 74425b8 · 74425b8
1 parent f867a8f
commit 74425b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/test/e2e/storage/testsuites/base.go b/test/e2e/storage/testsuites/base.go
@@ -592,7 +592,7 @@ func getPreProvisionedSnapshot(snapshotContentName, ns, snapshotHandle string) *
 
 	return snapshot
 }
-func getPreProvisionedSnapshotContent(snapshotName, snapshotNamespace, snapshotHandle, deletionPolicy, csiDriverName, volumeSnapshotClassName string) *unstructured.Unstructured {
+func getPreProvisionedSnapshotContent(snapshotName, snapshotNamespace, snapshotHandle, deletionPolicy, csiDriverName string) *unstructured.Unstructured {
 	snapshotContent := &unstructured.Unstructured{
 		Object: map[string]interface{}{
 			"kind":       "VolumeSnapshotContent",
@@ -608,9 +608,8 @@ func getPreProvisionedSnapshotContent(snapshotName, snapshotNamespace, snapshotH
 					"name":      snapshotName,
 					"namespace": snapshotNamespace,
 				},
-				"driver":                  csiDriverName,
-				"deletionPolicy":          deletionPolicy,
-				"volumeSnapshotClassName": volumeSnapshotClassName,
+				"driver":         csiDriverName,
+				"deletionPolicy": deletionPolicy,
 			},
 		},
 	}

diff --git a/test/e2e/storage/testsuites/snapshottable.go b/test/e2e/storage/testsuites/snapshottable.go
@@ -224,7 +224,10 @@ func (s *snapshottableTestSuite) DefineTests(driver TestDriver, pattern testpatt
 
 				// Check SnapshotContent properties
 				ginkgo.By("checking the SnapshotContent")
-				framework.ExpectEqual(snapshotContentSpec["volumeSnapshotClassName"], vsc.GetName())
+				// PreprovisionedCreatedSnapshot do not need to set volume snapshot class name
+				if pattern.SnapshotType != testpatterns.PreprovisionedCreatedSnapshot {
+					framework.ExpectEqual(snapshotContentSpec["volumeSnapshotClassName"], vsc.GetName())
+				}
 				framework.ExpectEqual(volumeSnapshotRef["name"], vs.GetName())
 				framework.ExpectEqual(volumeSnapshotRef["namespace"], vs.GetNamespace())
 
@@ -451,7 +454,7 @@ func CreateSnapshotResource(sDriver SnapshottableTestDriver, config *PerTestConf
 		framework.ExpectNoError(err)
 
 		ginkgo.By("creating a snapshot content with the snapshot handle")
-		r.Vscontent = getPreProvisionedSnapshotContent(getPreProvisionedSnapshotName(snapshotHandle), pvcNamespace, snapshotHandle, pattern.SnapshotDeletionPolicy.String(), csiDriverName, r.Vsclass.GetName())
+		r.Vscontent = getPreProvisionedSnapshotContent(getPreProvisionedSnapshotName(snapshotHandle), pvcNamespace, snapshotHandle, pattern.SnapshotDeletionPolicy.String(), csiDriverName)
 		r.Vscontent, err = dc.Resource(SnapshotContentGVR).Create(context.TODO(), r.Vscontent, metav1.CreateOptions{})
 		framework.ExpectNoError(err)