list should return full id (#1154)

kanisterio · Dec 10, 2021 · 64bc130 · 64bc130
1 parent 6cbf03e
commit 64bc130
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/pkg/blockstorage/vmware/vmware.go b/pkg/blockstorage/vmware/vmware.go
@@ -546,10 +546,11 @@ func (p *FcdProvider) getSnapshotIDsFromTags(categoryTags []vapitags.Tag, tags m
 		if err != nil {
 			return nil, errors.Wrapf(err, "Failed to parse tag")
 		}
-		if _, ok := snapshotTagMap[parsedTag.snapid]; !ok {
-			snapshotTagMap[parsedTag.snapid] = map[string]string{}
+		snapId := SnapshotFullID(parsedTag.volid, parsedTag.snapid)
+		if _, ok := snapshotTagMap[snapId]; !ok {
+			snapshotTagMap[snapId] = map[string]string{}
 		}
-		snapshotTagMap[parsedTag.snapid][parsedTag.key] = parsedTag.value
+		snapshotTagMap[snapId][parsedTag.key] = parsedTag.value
 	}
 
 	snapshotIDs := []string{}

diff --git a/pkg/blockstorage/vmware/vmware_test.go b/pkg/blockstorage/vmware/vmware_test.go
@@ -108,7 +108,7 @@ func (s *VMWareSuite) TestGetSnapshotIDsFromTags(c *C) {
 				"k1": "v1",
 				"k2": "v2",
 			},
-			snapIDs:    []string{"s1"},
+			snapIDs:    []string{"v1:s1"},
 			errChecker: IsNil,
 		},
 		{
@@ -120,7 +120,7 @@ func (s *VMWareSuite) TestGetSnapshotIDsFromTags(c *C) {
 			tags: map[string]string{
 				"k1": "v1",
 			},
-			snapIDs:    []string{"s1", "s2"},
+			snapIDs:    []string{"v1:s1", "v1:s2"},
 			errChecker: IsNil,
 		},
 		{
@@ -129,7 +129,7 @@ func (s *VMWareSuite) TestGetSnapshotIDsFromTags(c *C) {
 				{Name: "v1:s1:k2:v2"},
 				{Name: "v1:s2:k1:v1"},
 			},
-			snapIDs:    []string{"s1", "s2"},
+			snapIDs:    []string{"v1:s1", "v1:s2"},
 			errChecker: IsNil,
 		},
 		{