[DEBUG] Make volume/snapshot names unique

Author: timoreimann

pkg/sanity/controller.go

@@ -1346,31 +1346,31 @@ var _ = DescribeSanity("ListSnapshots [Controller Server]", func(sc *TestContext
 
 		By("creating first unrelated snapshot")
 		// Create volume source and afterwards the first unrelated snapshot.
-		volReq := MakeCreateVolumeReq(sc, "listSnapshots-volume-unrelated1")
+		volReq := MakeCreateVolumeReq(sc, "listSnapshots-snapshot-id-volume-unrelated1")
 		volumeUnrelated1, err := c.CreateVolume(context.Background(), volReq)
 		Expect(err).NotTo(HaveOccurred())
 
-		snapshotReq := MakeCreateSnapshotReq(sc, "listSnapshots-snapshot-unrelated1", volumeUnrelated1.GetVolume().GetVolumeId())
+		snapshotReq := MakeCreateSnapshotReq(sc, "listSnapshots-snapshot-id-snapshot-unrelated1", volumeUnrelated1.GetVolume().GetVolumeId())
 		snapshotUnrelated1, err := c.CreateSnapshot(context.Background(), snapshotReq)
 		Expect(err).NotTo(HaveOccurred())
 
 		By("creating target snapshot")
 		// Create volume source and afterwards the target snapshot.
-		volReq = MakeCreateVolumeReq(sc, "listSnapshots-volume-target")
+		volReq = MakeCreateVolumeReq(sc, "listSnapshots-snapshot-id-volume-target")
 		volumeTarget, err := c.CreateVolume(context.Background(), volReq)
 		Expect(err).NotTo(HaveOccurred())
 
-		snapshotReq = MakeCreateSnapshotReq(sc, "listSnapshots-snapshot-target", volumeTarget.GetVolume().GetVolumeId())
+		snapshotReq = MakeCreateSnapshotReq(sc, "listSnapshots-snapshot-id-snapshot-target", volumeTarget.GetVolume().GetVolumeId())
 		snapshotTarget, err := c.CreateSnapshot(context.Background(), snapshotReq)
 		Expect(err).NotTo(HaveOccurred())
 
 		By("creating second unrelated snapshot")
 		// Create volume source and afterwards the second unrelated snapshot.
-		volReq = MakeCreateVolumeReq(sc, "listSnapshots-volume-unrelated2")
+		volReq = MakeCreateVolumeReq(sc, "listSnapshots-snapshot-id-volume-unrelated2")
 		volumeUnrelated2, err := c.CreateVolume(context.Background(), volReq)
 		Expect(err).NotTo(HaveOccurred())
 
-		snapshotReq = MakeCreateSnapshotReq(sc, "listSnapshots-snapshot-unrelated2", volumeUnrelated2.GetVolume().GetVolumeId())
+		snapshotReq = MakeCreateSnapshotReq(sc, "listSnapshots-snapshot-id-snapshot-unrelated2", volumeUnrelated2.GetVolume().GetVolumeId())
 		snapshotUnrelated2, err := c.CreateSnapshot(context.Background(), snapshotReq)
 		Expect(err).NotTo(HaveOccurred())
 
@@ -1425,25 +1425,25 @@ var _ = DescribeSanity("ListSnapshots [Controller Server]", func(sc *TestContext
 
 		By("creating first unrelated snapshot")
 		// Create volume source and afterwards the first unrelated snapshot.
-		volReq := MakeCreateVolumeReq(sc, "listSnapshots-volume-unrelated1")
+		volReq := MakeCreateVolumeReq(sc, "listSnapshots-src-vol-id-volume-unrelated1")
 		volumeUnrelated1, err := c.CreateVolume(context.Background(), volReq)
 		Expect(err).NotTo(HaveOccurred())
 
-		snapshotReq := MakeCreateSnapshotReq(sc, "listSnapshots-snapshot-unrelated1", volumeUnrelated1.GetVolume().GetVolumeId())
+		snapshotReq := MakeCreateSnapshotReq(sc, "listSnapshots-src-vol-id-snapshot-unrelated1", volumeUnrelated1.GetVolume().GetVolumeId())
 		snapshotUnrelated1, err := c.CreateSnapshot(context.Background(), snapshotReq)
 		Expect(err).NotTo(HaveOccurred())
 
 		By("creating target snapshots")
 		// Create volume source and afterwards the two target snapshots.
-		volReq = MakeCreateVolumeReq(sc, "listSnapshots-volume-target")
+		volReq = MakeCreateVolumeReq(sc, "listSnapshots-src-vol-id-volume-target")
 		volumeTarget, err := c.CreateVolume(context.Background(), volReq)
 		Expect(err).NotTo(HaveOccurred())
 
-		snapshotReq = MakeCreateSnapshotReq(sc, "listSnapshots-snapshot-target1", volumeTarget.GetVolume().GetVolumeId())
+		snapshotReq = MakeCreateSnapshotReq(sc, "listSnapshots-src-vol-id-snapshot-target1", volumeTarget.GetVolume().GetVolumeId())
 		snapshotTarget1, err := c.CreateSnapshot(context.Background(), snapshotReq)
 		Expect(err).NotTo(HaveOccurred())
 
-		snapshotReq = MakeCreateSnapshotReq(sc, "listSnapshots-snapshot-target2", volumeTarget.GetVolume().GetVolumeId())
+		snapshotReq = MakeCreateSnapshotReq(sc, "listSnapshots-src-vol-id-snapshot-target2", volumeTarget.GetVolume().GetVolumeId())
 		snapshotTarget2, err := c.CreateSnapshot(context.Background(), snapshotReq)
 		Expect(err).NotTo(HaveOccurred())
 
@@ -1454,11 +1454,11 @@ var _ = DescribeSanity("ListSnapshots [Controller Server]", func(sc *TestContext
 
 		By("creating second unrelated snapshot")
 		// Create volume source and afterwards the second unrelated snapshot.
-		volReq = MakeCreateVolumeReq(sc, "listSnapshots-volume-unrelated2")
+		volReq = MakeCreateVolumeReq(sc, "listSnapshots-src-vol-id-volume-unrelated2")
 		volumeUnrelated2, err := c.CreateVolume(context.Background(), volReq)
 		Expect(err).NotTo(HaveOccurred())
 
-		snapshotReq = MakeCreateSnapshotReq(sc, "listSnapshots-snapshot-unrelated2", volumeUnrelated2.GetVolume().GetVolumeId())
+		snapshotReq = MakeCreateSnapshotReq(sc, "listSnapshots-src-vol-id-snapshot-unrelated2", volumeUnrelated2.GetVolume().GetVolumeId())
 		snapshotUnrelated2, err := c.CreateSnapshot(context.Background(), snapshotReq)
 		Expect(err).NotTo(HaveOccurred())