vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

move PV/PVC setup helpers into pkg/test 

Signed-off-by: Steve Kriss <krisss@vmware.com>
pull/1614/head
Steve Kriss 2019-07-02 09:49:34 -06:00
parent adb93c33b1
commit 567802299b
2 changed files with 90 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
pkg/restore/restore_new_test.go
View File

@ -1728,48 +1728,6 @@ func (*volumeSnapshotter) DeleteSnapshot(snapshotID string) error {
// Verification is done by looking at the contents of the API and the metadata/spec/status of
// the items in the API.
func TestRestorePersistentVolumes(t *testing.T) {
withReclaimPolicy := func(policy corev1api.PersistentVolumeReclaimPolicy) func(*corev1api.PersistentVolume) {
return func(pv *corev1api.PersistentVolume) {
pv.Spec.PersistentVolumeReclaimPolicy = policy
}
}
withClaimRef := func(ns, name string) func(*corev1api.PersistentVolume) {
return func(pv *corev1api.PersistentVolume) {
pv.Spec.ClaimRef = &corev1api.ObjectReference{
Namespace: ns,
Name: name,
}
}
}
withVolumeName := func(volumeName string) func(*corev1api.PersistentVolume) {
return func(pv *corev1api.PersistentVolume) {
pv.Spec.AWSElasticBlockStore = &corev1api.AWSElasticBlockStoreVolumeSource{
VolumeID: volumeName,
}
}
}
withLabels := func(labels ...string) func(*corev1api.PersistentVolume) {
return func(pv *corev1api.PersistentVolume) {
test.WithLabels(labels...)(pv)
}
}
newPV := func(name string, opts ...func(*corev1api.PersistentVolume)) *corev1api.PersistentVolume {
pv := test.NewPV(name)
for _, opt := range opts {
opt(pv)
}
return pv
}
newPVC := func(ns, name, volumeName string, annotations map[string]string) *corev1api.PersistentVolumeClaim {
pvc := test.NewPVC(ns, name)
pvc.Spec.VolumeName = volumeName
pvc.Annotations = annotations
return pvc
}
tests := []struct {
name string
restore *velerov1api.Restore
@ -1787,14 +1745,13 @@ func TestRestorePersistentVolumes(t *testing.T) {
backup: defaultBackup().Backup(),
tarball: newTarWriter(t).
addItems("persistentvolumes",
newPV("pv-1", withReclaimPolicy(corev1api.PersistentVolumeReclaimDelete), withClaimRef("ns-1", "pvc-1")),
test.NewPV("pv-1", test.WithReclaimPolicy(corev1api.PersistentVolumeReclaimDelete), test.WithClaimRef("ns-1", "pvc-1")),
).
addItems("persistentvolumeclaims",
newPVC("ns-1", "pvc-1", "pv-1", map[string]string{
"pv.kubernetes.io/bind-completed": "true",
"pv.kubernetes.io/bound-by-controller": "true",
"foo": "bar",
}),
test.NewPVC("ns-1", "pvc-1",
test.WithVolumeName("pv-1"),
test.WithAnnotations("pv.kubernetes.io/bind-completed", "true", "pv.kubernetes.io/bound-by-controller", "true", "foo", "bar"),
),
).
done(),
apiResources: []*test.APIResource{
@ -1804,8 +1761,7 @@ func TestRestorePersistentVolumes(t *testing.T) {
want: []*test.APIResource{
test.PVs(),
test.PVCs(
test.NewPVC(
"ns-1", "pvc-1",
test.NewPVC("ns-1", "pvc-1",
test.WithAnnotations("foo", "bar"),
test.WithLabels("velero.io/backup-name", "backup-1", "velero.io/restore-name", "restore-1"),
),
@ -1818,7 +1774,7 @@ func TestRestorePersistentVolumes(t *testing.T) {
backup: defaultBackup().Backup(),
tarball: newTarWriter(t).
addItems("persistentvolumes",
newPV("pv-1", withReclaimPolicy(corev1api.PersistentVolumeReclaimRetain), withClaimRef("ns-1", "pvc-1")),
test.NewPV("pv-1", test.WithReclaimPolicy(corev1api.PersistentVolumeReclaimRetain), test.WithClaimRef("ns-1", "pvc-1")),
).
done(),
apiResources: []*test.APIResource{
@ -1827,10 +1783,9 @@ func TestRestorePersistentVolumes(t *testing.T) {
},
want: []*test.APIResource{
test.PVs(
newPV(
"pv-1",
withReclaimPolicy(corev1api.PersistentVolumeReclaimRetain),
withLabels("velero.io/backup-name", "backup-1", "velero.io/restore-name", "restore-1"),
test.NewPV("pv-1",
test.WithReclaimPolicy(corev1api.PersistentVolumeReclaimRetain),
test.WithLabels("velero.io/backup-name", "backup-1", "velero.io/restore-name", "restore-1"),
),
),
},
@ -1840,7 +1795,8 @@ func TestRestorePersistentVolumes(t *testing.T) {
restore: defaultRestore().Restore(),
backup: defaultBackup().Backup(),
tarball: newTarWriter(t).
addItems("persistentvolumes", newPV("pv-1", withReclaimPolicy(corev1api.PersistentVolumeReclaimDelete), withVolumeName("old-volume"))).
addItems("persistentvolumes",
test.NewPV("pv-1", test.WithReclaimPolicy(corev1api.PersistentVolumeReclaimDelete), test.WithAWSEBSVolumeID("old-volume"))).
done(),
apiResources: []*test.APIResource{
test.PVs(),
@ -1877,10 +1833,10 @@ func TestRestorePersistentVolumes(t *testing.T) {
},
want: []*test.APIResource{
test.PVs(
newPV(
"pv-1",
withReclaimPolicy(corev1api.PersistentVolumeReclaimDelete), withVolumeName("new-volume"),
withLabels("velero.io/backup-name", "backup-1", "velero.io/restore-name", "restore-1"),
test.NewPV("pv-1",
test.WithReclaimPolicy(corev1api.PersistentVolumeReclaimDelete),
test.WithAWSEBSVolumeID("new-volume"),
test.WithLabels("velero.io/backup-name", "backup-1", "velero.io/restore-name", "restore-1"),
),
),
},
@ -1890,7 +1846,8 @@ func TestRestorePersistentVolumes(t *testing.T) {
restore: defaultRestore().Restore(),
backup: defaultBackup().Backup(),
tarball: newTarWriter(t).
addItems("persistentvolumes", newPV("pv-1", withReclaimPolicy(corev1api.PersistentVolumeReclaimRetain), withVolumeName("old-volume"))).
addItems("persistentvolumes",
test.NewPV("pv-1", test.WithReclaimPolicy(corev1api.PersistentVolumeReclaimRetain), test.WithAWSEBSVolumeID("old-volume"))).
done(),
apiResources: []*test.APIResource{
test.PVs(),
@ -1927,11 +1884,10 @@ func TestRestorePersistentVolumes(t *testing.T) {
},
want: []*test.APIResource{
test.PVs(
newPV(
"pv-1",
withReclaimPolicy(corev1api.PersistentVolumeReclaimRetain),
withVolumeName("new-volume"),
withLabels("velero.io/backup-name", "backup-1", "velero.io/restore-name", "restore-1"),
test.NewPV("pv-1",
test.WithReclaimPolicy(corev1api.PersistentVolumeReclaimRetain),
test.WithAWSEBSVolumeID("new-volume"),
test.WithLabels("velero.io/backup-name", "backup-1", "velero.io/restore-name", "restore-1"),
),
),
},
@ -1941,11 +1897,12 @@ func TestRestorePersistentVolumes(t *testing.T) {
restore: defaultRestore().Restore(),
backup: defaultBackup().Backup(),
tarball: newTarWriter(t).
addItems("persistentvolumes", newPV("pv-1", withReclaimPolicy(corev1api.PersistentVolumeReclaimDelete), withVolumeName("old-volume"))).
addItems("persistentvolumes",
test.NewPV("pv-1", test.WithReclaimPolicy(corev1api.PersistentVolumeReclaimDelete), test.WithAWSEBSVolumeID("old-volume"))).
done(),
apiResources: []*test.APIResource{
test.PVs(
newPV("pv-1", withReclaimPolicy(corev1api.PersistentVolumeReclaimDelete), withVolumeName("old-volume")),
test.NewPV("pv-1", test.WithReclaimPolicy(corev1api.PersistentVolumeReclaimDelete), test.WithAWSEBSVolumeID("old-volume")),
),
test.PVCs(),
},
@ -1981,7 +1938,7 @@ func TestRestorePersistentVolumes(t *testing.T) {
},
want: []*test.APIResource{
test.PVs(
newPV("pv-1", withReclaimPolicy(corev1api.PersistentVolumeReclaimDelete), withVolumeName("old-volume")),
test.NewPV("pv-1", test.WithReclaimPolicy(corev1api.PersistentVolumeReclaimDelete), test.WithAWSEBSVolumeID("old-volume")),
),
},
},
@ -1990,11 +1947,12 @@ func TestRestorePersistentVolumes(t *testing.T) {
restore: defaultRestore().Restore(),
backup: defaultBackup().Backup(),
tarball: newTarWriter(t).
addItems("persistentvolumes", newPV("pv-1", withReclaimPolicy(corev1api.PersistentVolumeReclaimRetain), withVolumeName("old-volume"))).
addItems("persistentvolumes",
test.NewPV("pv-1", test.WithReclaimPolicy(corev1api.PersistentVolumeReclaimRetain), test.WithAWSEBSVolumeID("old-volume"))).
done(),
apiResources: []*test.APIResource{
test.PVs(
newPV("pv-1", withReclaimPolicy(corev1api.PersistentVolumeReclaimRetain), withVolumeName("old-volume")),
test.NewPV("pv-1", test.WithReclaimPolicy(corev1api.PersistentVolumeReclaimRetain), test.WithAWSEBSVolumeID("old-volume")),
),
test.PVCs(),
},
@ -2029,9 +1987,7 @@ func TestRestorePersistentVolumes(t *testing.T) {
"provider-1": &volumeSnapshotter{},
},
want: []*test.APIResource{
test.PVs(
newPV("pv-1", withReclaimPolicy(corev1api.PersistentVolumeReclaimRetain), withVolumeName("old-volume")),
),
test.PVs(test.NewPV("pv-1", test.WithReclaimPolicy(corev1api.PersistentVolumeReclaimRetain), test.WithAWSEBSVolumeID("old-volume"))),
},
},
}

60
pkg/test/resources.go
View File

@ -320,3 +320,63 @@ func WithDeletionTimestamp(val time.Time) func(obj metav1.Object) {
obj.SetDeletionTimestamp(&metav1.Time{Time: val})
}
}
// WithReclaimPolicy is a functional option for persistent volumes that sets
// the specified reclaim policy. It panics if the object is not a persistent
// volume.
func WithReclaimPolicy(policy corev1.PersistentVolumeReclaimPolicy) func(obj metav1.Object) {
return func(obj metav1.Object) {
pv, ok := obj.(*corev1.PersistentVolume)
if !ok {
panic("WithReclaimPolicy is only valid for persistent volumes")
}
pv.Spec.PersistentVolumeReclaimPolicy = policy
}
}
// WithClaimRef is a functional option for persistent volumes that sets the specified
// claim ref. It panics if the object is not a persistent volume.
func WithClaimRef(ns, name string) func(obj metav1.Object) {
return func(obj metav1.Object) {
pv, ok := obj.(*corev1.PersistentVolume)
if !ok {
panic("WithClaimRef is only valid for persistent volumes")
}
pv.Spec.ClaimRef = &corev1.ObjectReference{
Namespace: ns,
Name: name,
}
}
}
// WithAWSEBSVolumeID is a functional option for persistent volumes that sets the specified
// AWS EBS volume ID. It panics if the object is not a persistent volume.
func WithAWSEBSVolumeID(volumeID string) func(obj metav1.Object) {
return func(obj metav1.Object) {
pv, ok := obj.(*corev1.PersistentVolume)
if !ok {
panic("WithClaimRef is only valid for persistent volumes")
}
if pv.Spec.AWSElasticBlockStore == nil {
pv.Spec.AWSElasticBlockStore = new(corev1.AWSElasticBlockStoreVolumeSource)
}
pv.Spec.AWSElasticBlockStore.VolumeID = volumeID
}
}
// WithVolumeName is a functional option for persistent volume claims that sets the specified
// volume name. It panics if the object is not a persistent volume claim.
func WithVolumeName(name string) func(obj metav1.Object) {
return func(obj metav1.Object) {
pvc, ok := obj.(*corev1.PersistentVolumeClaim)
if !ok {
panic("WithVolumeName is only valid for persistent volume claims")
}
pvc.Spec.VolumeName = name
}
}