Skip to content

Commit 084aefe

Browse files
luohaomattcary
luohao
authored and
mattcary
committed
Add e2e and integration tests for image snapshot
1 parent cef533c commit 084aefe

8 files changed

+120
-13
lines changed

‎test/e2e/tests/single_zone_e2e_test.go

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -946,6 +946,65 @@ var _ = Describe("GCE PD CSI Driver", func() {
946946
Expect(gce.IsGCEError(err, "notFound")).To(BeTrue(), "Expected snapshot to not be found")
947947
}()
948948
})
949+
950+
// Use the region of the test location.
951+
It("Should successfully create snapshot backed by disk image", func() {
952+
testContext := getRandomTestContext()
953+
954+
p, z, _ := testContext.Instance.GetIdentity()
955+
client := testContext.Client
956+
957+
// Create Disk
958+
volName, volID := createAndValidateUniqueZonalDisk(client, p, z)
959+
960+
// Create Snapshot
961+
snapshotName := testNamePrefix + string(uuid.NewUUID())
962+
testImageFamily := "test-family"
963+
964+
snapshotParams := map[string]string{common.ParameterKeySnapshotType: common.DiskImageType, common.ParameterKeyImageFamily: testImageFamily}
965+
snapshotID, err := client.CreateSnapshot(snapshotName, volID, snapshotParams)
966+
Expect(err).To(BeNil(), "CreateSnapshot failed with error: %v", err)
967+
968+
// Validate Snapshot Created
969+
snapshot, err := computeService.Images.Get(p, snapshotName).Do()
970+
Expect(err).To(BeNil(), "Could not get snapshot from cloud directly")
971+
Expect(snapshot.Name).To(Equal(snapshotName))
972+
973+
err = wait.Poll(10*time.Second, 5*time.Minute, func() (bool, error) {
974+
snapshot, err := computeService.Images.Get(p, snapshotName).Do()
975+
Expect(err).To(BeNil(), "Could not get snapshot from cloud directly")
976+
if snapshot.Status == "READY" {
977+
return true, nil
978+
}
979+
return false, nil
980+
})
981+
Expect(err).To(BeNil(), "Could not wait for snapshot be ready")
982+
983+
// Check Snapshot Type
984+
snapshot, err = computeService.Images.Get(p, snapshotName).Do()
985+
Expect(err).To(BeNil(), "Could not get snapshot from cloud directly")
986+
_, snapshotType, _, err := common.SnapshotIDToProjectKey(cleanSelfLink(snapshot.SelfLink))
987+
Expect(err).To(BeNil(), "Failed to parse snapshot ID")
988+
Expect(snapshotType).To(Equal(common.DiskImageType), "Expected images type in snapshot ID")
989+
990+
defer func() {
991+
// Delete Disk
992+
err := client.DeleteVolume(volID)
993+
Expect(err).To(BeNil(), "DeleteVolume failed")
994+
995+
// Validate Disk Deleted
996+
_, err = computeService.Disks.Get(p, z, volName).Do()
997+
Expect(gce.IsGCEError(err, "notFound")).To(BeTrue(), "Expected disk to not be found")
998+
999+
// Delete Snapshot
1000+
err = client.DeleteSnapshot(snapshotID)
1001+
Expect(err).To(BeNil(), "DeleteSnapshot failed")
1002+
1003+
// Validate Snapshot Deleted
1004+
_, err = computeService.Images.Get(p, snapshotName).Do()
1005+
Expect(gce.IsGCEError(err, "notFound")).To(BeTrue(), "Expected snapshot to not be found")
1006+
}()
1007+
})
9491008
})
9501009

9511010
func equalWithinEpsilon(a, b, epsiolon int64) bool {
@@ -1025,3 +1084,9 @@ func createAndValidateUniqueZonalMultiWriterDisk(client *remote.CsiClient, proje
10251084

10261085
return volName, volID
10271086
}
1087+
1088+
func cleanSelfLink(selfLink string) string {
1089+
temp := strings.TrimPrefix(selfLink, gce.GCEComputeAPIEndpoint)
1090+
temp = strings.TrimPrefix(temp, gce.GCEComputeBetaAPIEndpoint)
1091+
return strings.TrimPrefix(temp, gce.GCEComputeAlphaAPIEndpoint)
1092+
}

‎test/k8s-integration/config/image-volumesnapshotclass.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: snapshot.storage.k8s.io/v1beta1
2+
kind: VolumeSnapshotClass
3+
metadata:
4+
name: csi-gce-image-snapshot-class
5+
driver: pd.csi.storage.gke.io
6+
deletionPolicy: Delete
7+
parameters:
8+
snapshot-type: images
9+
image-family: integration-test

‎test/k8s-integration/main.go

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var (
5757
// Test infrastructure flags
5858
boskosResourceType = flag.String("boskos-resource-type", "gce-project", "name of the boskos resource type to reserve")
5959
storageClassFiles = flag.String("storageclass-files", "", "name of storageclass yaml file to use for test relative to test/k8s-integration/config. This may be a comma-separated list to test multiple storage classes")
60-
snapshotClassFile = flag.String("snapshotclass-file", "", "name of snapshotclass yaml file to use for test relative to test/k8s-integration/config")
60+
snapshotClassFiles = flag.String("snapshotclass-files", "", "name of snapshotclass yaml file to use for test relative to test/k8s-integration/config. This may be a comma-separated list to test multiple storage classes")
6161
inProw = flag.Bool("run-in-prow", false, "is the test running in PROW")
6262

6363
// Driver flags
@@ -203,7 +203,6 @@ func handle() error {
203203
testParams := &testParameters{
204204
platform: *platform,
205205
testFocus: *testFocus,
206-
snapshotClassFile: *snapshotClassFile,
207206
stagingVersion: string(uuid.NewUUID()),
208207
deploymentStrategy: *deploymentStrat,
209208
useGKEManagedDriver: *useGKEManagedDriver,
@@ -481,6 +480,7 @@ func handle() error {
481480
// Run the tests using the k8sSourceDir kubernetes
482481
if len(*storageClassFiles) != 0 {
483482
applicableStorageClassFiles := []string{}
483+
applicableSnapshotClassFiles := []string{}
484484
for _, rawScFile := range strings.Split(*storageClassFiles, ",") {
485485
scFile := strings.TrimSpace(rawScFile)
486486
if len(scFile) == 0 {
@@ -495,13 +495,29 @@ func handle() error {
495495
if len(applicableStorageClassFiles) == 0 {
496496
return fmt.Errorf("No applicable storage classes found")
497497
}
498+
for _, rawSnapshotClassFile := range strings.Split(*snapshotClassFiles, ",") {
499+
snapshotClassFile := strings.TrimSpace(rawSnapshotClassFile)
500+
if len(snapshotClassFile) != 0 {
501+
applicableSnapshotClassFiles = append(applicableSnapshotClassFiles, snapshotClassFile)
502+
}
503+
}
504+
if len(applicableSnapshotClassFiles) == 0 {
505+
// when no snapshot class specified, we run the tests without snapshot capability
506+
applicableSnapshotClassFiles = append(applicableSnapshotClassFiles, "")
507+
}
498508
var ginkgoErrors []string
499509
var testOutputDirs []string
500510
for _, scFile := range applicableStorageClassFiles {
501511
outputDir := strings.TrimSuffix(scFile, ".yaml")
502-
testOutputDirs = append(testOutputDirs, outputDir)
503-
if err = runCSITests(testParams, scFile, outputDir); err != nil {
504-
ginkgoErrors = append(ginkgoErrors, err.Error())
512+
for _, snapshotClassFile := range applicableSnapshotClassFiles {
513+
if len(snapshotClassFile) != 0 {
514+
outputDir = fmt.Sprintf("%s--%s", outputDir, strings.TrimSuffix(snapshotClassFile, ".yaml"))
515+
}
516+
testOutputDirs = append(testOutputDirs, outputDir)
517+
testParams.snapshotClassFile = snapshotClassFile
518+
if err = runCSITests(testParams, scFile, outputDir); err != nil {
519+
ginkgoErrors = append(ginkgoErrors, err.Error())
520+
}
505521
}
506522
}
507523
if err = mergeArtifacts(testOutputDirs); err != nil {

‎test/run-k8s-integration-ci.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ readonly run_intree_plugin_tests=${RUN_INTREE_PLUGIN_TESTS:-false}
2929
readonly use_kubetest2=${USE_KUBETEST2:-true}
3030
readonly test_pd_labels=${TEST_PD_LABELS:-true}
3131
readonly migration_test=${MIGRATION_TEST:-false}
32+
readonly test_disk_image_snapshot=${TEST_DISK_IMAGE_SNAPSHOT:-true}
3233

3334
readonly GCE_PD_TEST_FOCUS="PersistentVolumes\sGCEPD|[V|v]olume\sexpand|\[sig-storage\]\sIn-tree\sVolumes\s\[Driver:\sgcepd\]|allowedTopologies|Pod\sDisks|PersistentVolumes\sDefault"
3435

@@ -62,7 +63,7 @@ fi
6263
base_cmd="${PKGDIR}/bin/k8s-integration-test \
6364
--run-in-prow=true --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} \
6465
--do-driver-build=${do_driver_build} --teardown-driver=${teardown_driver} --boskos-resource-type=${boskos_resource_type} \
65-
--storageclass-files="${storage_classes}" --snapshotclass-file=pd-volumesnapshotclass.yaml \
66+
--storageclass-files="${storage_classes}" \
6667
--deployment-strategy=${deployment_strategy} --test-version=${test_version} \
6768
--num-nodes=3 --image-type=${image_type} --use-kubetest2=${use_kubetest2}"
6869

@@ -100,4 +101,10 @@ if [ -n "$gke_node_version" ]; then
100101
base_cmd="${base_cmd} --gke-node-version=${gke_node_version}"
101102
fi
102103

104+
if [ "$test_disk_image_snapshot" = true ]; then
105+
base_cmd="${base_cmd} --snapshotclass-files=image-volumesnapshotclass.yaml,pd-volumesnapshotclass.yaml"
106+
else
107+
base_cmd="${base_cmd} --snapshotclass-files=pd-volumesnapshotclass.yaml"
108+
fi
109+
103110
eval "$base_cmd"

‎test/run-k8s-integration-local.sh

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,25 @@ make -C "${PKGDIR}" test-k8s-integration
5050
#${PKGDIR}/bin/k8s-integration-test --run-in-prow=false \
5151
#--staging-image=${GCE_PD_CSI_STAGING_IMAGE} --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
5252
#--deploy-overlay-name=prow-canary-sidecar --bringup-cluster=false --teardown-cluster=false --test-focus="External.*Storage.*snapshot" --local-k8s-dir=$KTOP \
53-
#--storageclass-files=sc-standard.yaml,sc-balanced.yaml,sc-ssd.yaml --snapshotclass-file=pd-volumesnapshotclass.yaml --do-driver-build=true \
53+
#--storageclass-files=sc-standard.yaml,sc-balanced.yaml,sc-ssd.yaml --snapshotclass-files=pd-volumesnapshotclass.yaml --do-driver-build=true \
54+
#--gce-zone="us-central1-b" --num-nodes=${NUM_NODES:-3}
55+
56+
# This version of the command builds and deploys the GCE PD CSI driver.
57+
# Points to a local K8s repository to get the e2e test binary, does not bring up
58+
# or tear down the kubernetes cluster. In addition, it runs External Storage
59+
# snapshot tests for the PD CSI driver using disk image snapshots.
60+
#${PKGDIR}/bin/k8s-integration-test --run-in-prow=false \
61+
#--staging-image=${GCE_PD_CSI_STAGING_IMAGE} --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
62+
#--deploy-overlay-name=prow-canary-sidecar --bringup-cluster=false --teardown-cluster=false --test-focus="External.*Storage.*snapshot" --local-k8s-dir=$KTOP \
63+
#--storageclass-files=sc-standard.yaml,sc-balanced.yaml,sc-ssd.yaml --snapshotclass-files=image-volumesnapshotclass.yaml --do-driver-build=true \
5464
#--gce-zone="us-central1-b" --num-nodes=${NUM_NODES:-3}
5565

5666
# This version of the command brings up (and subsequently tears down) a GKE
5767
# cluster with managed GCE PersistentDisk CSI driver add-on enabled, and points to
5868
# the local K8s repository to get the e2e test binary.
5969
# ${PKGDIR}/bin/k8s-integration-test --run-in-prow=false --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
6070
# --test-focus="External.Storage" --local-k8s-dir=$KTOP --storageclass-files=sc-standard.yaml,sc-balanced.yaml,sc-ssd.yaml \
61-
# --snapshotclass-file=pd-volumesnapshotclass.yaml --do-driver-build=false --teardown-driver=false \
71+
# --snapshotclass-files=pd-volumesnapshotclass.yaml --do-driver-build=false --teardown-driver=false \
6272
# --gce-zone="us-central1-c" --num-nodes=${NUM_NODES:-3} --gke-cluster-version="latest" --deployment-strategy="gke" \
6373
# --use-gke-managed-driver=true --teardown-cluster=true
6474

@@ -67,7 +77,7 @@ make -C "${PKGDIR}" test-k8s-integration
6777
# the local K8s repository to get the e2e test binary.
6878
# ${PKGDIR}/bin/k8s-integration-test --run-in-prow=false --service-account-file=${GCE_PD_SA_DIR}/cloud-sa.json \
6979
# --test-focus="External.Storage" --local-k8s-dir=$KTOP --storageclass-files=sc-standard.yaml,sc-balanced.yaml,sc-ssd.yaml \
70-
# --snapshotclass-file=pd-volumesnapshotclass.yaml --do-driver-build=false --teardown-driver=false \
80+
# --snapshotclass-files=pd-volumesnapshotclass.yaml --do-driver-build=false --teardown-driver=false \
7181
# --gce-zone="us-central1-c" --num-nodes=${NUM_NODES:-3} --gke-release-channel="rapid" --deployment-strategy="gke" \
7282
# --use-gke-managed-driver=true --teardown-cluster=true
7383

@@ -96,4 +106,4 @@ make -C "${PKGDIR}" test-k8s-integration
96106
# --staging-image="${GCE_PD_CSI_STAGING_IMAGE}" --service-account-file="${GCE_PD_SA_DIR}/cloud-sa.json" \
97107
# --deploy-overlay-name=dev --bringup-cluster=false --teardown-cluster=false --local-k8s-dir="$KTOP" \
98108
# --storageclass-files=sc-standard.yaml --do-driver-build=false --test-focus='External.Storage' \
99-
# --gce-zone="us-central1-b" --num-nodes="${NUM_NODES:-3}"
109+
# --gce-zone="us-central1-b" --num-nodes="${NUM_NODES:-3}"

‎test/run-k8s-integration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fi
4444
base_cmd="${PKGDIR}/bin/k8s-integration-test \
4545
--run-in-prow=true --service-account-file=${E2E_GOOGLE_APPLICATION_CREDENTIALS} \
4646
--do-driver-build=${do_driver_build} --teardown-driver=${teardown_driver} --boskos-resource-type=${boskos_resource_type} \
47-
--storageclass-files=sc-standard.yaml --snapshotclass-file=pd-volumesnapshotclass.yaml \
47+
--storageclass-files=sc-standard.yaml --snapshotclass-files=pd-volumesnapshotclass.yaml \
4848
--deployment-strategy=${deployment_strategy} --test-version=${test_version} \
4949
--num-nodes=3 --image-type=${image_type} --use-kubetest2=${use_kubetest2}"
5050

‎test/run-windows-k8s-integration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ ${PKGDIR}/bin/k8s-integration-test \
5151
--test-version="${test_version}" \
5252
--kube-version="${kube_version}" \
5353
--storageclass-files=sc-windows.yaml \
54-
--snapshotclass-file=pd-volumesnapshotclass.yaml \
54+
--snapshotclass-files=pd-volumesnapshotclass.yaml \
5555
--test-focus='External.Storage' \
5656
--use-kubetest2="${use_kubetest2}"

‎test/run-windows-k8s-migration.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ ${PKGDIR}/bin/k8s-integration-test \
6060
--kube-version="${kube_version}" \
6161
--kube-feature-gates="${feature_gates}" \
6262
--storageclass-files=sc-windows.yaml \
63-
--snapshotclass-file=pd-volumesnapshotclass.yaml \
63+
--snapshotclass-files=pd-volumesnapshotclass.yaml \
6464
--test-focus="${GCE_PD_TEST_FOCUS}" \
6565
--use-kubetest2="${use_kubetest2}"

0 commit comments

Comments
 (0)