diff --git a/e2e/cephfs.go b/e2e/cephfs.go index afb8d7835..509972c19 100644 --- a/e2e/cephfs.go +++ b/e2e/cephfs.go @@ -970,7 +970,10 @@ var _ = Describe(cephfsType, func() { } else if metadata.VolSnapContentNameKey != content.Name { e2elog.Failf("failed, contentname expected:%s got:%s", content.Name, metadata.VolSnapContentNameKey) + } else if metadata.ClusterNameKey != defaultClusterName { + e2elog.Failf("expected clusterName %q got %q", defaultClusterName, metadata.ClusterNameKey) } + // Delete the parent pvc before restoring // another one from snapshot. err = deletePVCAndValidatePV(f.ClientSet, pvc, deployTimeout) @@ -1005,6 +1008,8 @@ var _ = Describe(cephfsType, func() { e2elog.Failf("expected pvcNamespace %q got %q", pvcClone.Namespace, cloneMetadata.PVCNamespaceKey) } else if cloneMetadata.PVNameKey != pvcCloneObj.Spec.VolumeName { e2elog.Failf("expected pvName %q got %q", pvcCloneObj.Spec.VolumeName, cloneMetadata.PVNameKey) + } else if cloneMetadata.ClusterNameKey != defaultClusterName { + e2elog.Failf("expected clusterName %q got %q", defaultClusterName, cloneMetadata.ClusterNameKey) } // delete clone @@ -1067,6 +1072,8 @@ var _ = Describe(cephfsType, func() { e2elog.Failf("expected pvcNamespace %q got %q", pvc.Namespace, cloneMetadata.PVCNamespaceKey) } else if cloneMetadata.PVNameKey != pvcCloneObj.Spec.VolumeName { e2elog.Failf("expected pvName %q got %q", pvcCloneObj.Spec.VolumeName, cloneMetadata.PVNameKey) + } else if cloneMetadata.ClusterNameKey != defaultClusterName { + e2elog.Failf("expected clusterName %q got %q", defaultClusterName, cloneMetadata.ClusterNameKey) } err = deletePVCAndValidatePV(f.ClientSet, pvcClone, deployTimeout) diff --git a/e2e/cephfs_helper.go b/e2e/cephfs_helper.go index e096734e5..dd0a58124 100644 --- a/e2e/cephfs_helper.go +++ b/e2e/cephfs_helper.go @@ -249,6 +249,7 @@ type cephfsSnapshotMetadata struct { VolSnapNameKey string `json:"csi.storage.k8s.io/volumesnapshot/name"` VolSnapNamespaceKey string `json:"csi.storage.k8s.io/volumesnapshot/namespace"` VolSnapContentNameKey string `json:"csi.storage.k8s.io/volumesnapshotcontent/name"` + ClusterNameKey string `json:"csi.ceph.com/cluster/name"` } func listCephFSSnapshotMetadata(