From dcfaaefc606c8f3719a867fd7670f22b59cd3861 Mon Sep 17 00:00:00 2001 From: Saikat Roychowdhury Date: Fri, 8 May 2020 02:48:49 +0000 Subject: [PATCH] Pickup Snapshot Provisioner from the snapshot class "driver" info. When using FromFile or FromExisitingClass options, snapshot provisioner should be picked up from the "driver" tag of VolumeSnapshotClass object. --- test/e2e/storage/external/external.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/e2e/storage/external/external.go b/test/e2e/storage/external/external.go index 7db679eeb1b..42c1831c6fc 100644 --- a/test/e2e/storage/external/external.go +++ b/test/e2e/storage/external/external.go @@ -339,6 +339,10 @@ func (d *driverDefinition) GetSnapshotClass(e2econfig *testsuites.PerTestConfig) parameters[k] = v.(string) } } + + if snapshotProvider, ok := snapshotClass.Object["driver"]; ok { + snapshotter = snapshotProvider.(string) + } case d.SnapshotClass.FromFile != "": snapshotClass, err := loadSnapshotClass(d.SnapshotClass.FromFile) framework.ExpectNoError(err, "load snapshot class from %s", d.SnapshotClass.FromFile) @@ -348,6 +352,10 @@ func (d *driverDefinition) GetSnapshotClass(e2econfig *testsuites.PerTestConfig) parameters[k] = v.(string) } } + + if snapshotProvider, ok := snapshotClass.Object["driver"]; ok { + snapshotter = snapshotProvider.(string) + } } return testsuites.GetSnapshotClass(snapshotter, parameters, ns, suffix)