PWX-38585: PR feedback

Signed-off-by: Adam Krpan <[email protected]>
libopenstorage · Aug 20, 2024 · f678c15 · f678c15
1 parent a54ebad
commit f678c15
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/csi/controller.go b/csi/controller.go
@@ -618,9 +618,6 @@ func (s *OsdCsiServer) CreateVolume(
 		if spec.GetFADAPodName() != "" {
 			labels[api.SpecPurePodName] = spec.GetFADAPodName()
 		}
-		delete(labels, intreePvcNameKey)
-		delete(labels, intreePvcNamespaceKey)
-		delete(labels, api.SpecParent)
 		cloneResp, err := volumes.Clone(ctx, &api.SdkVolumeCloneRequest{
 			Name:             req.GetName(),
 			ParentId:         source.Parent,

diff --git a/csi/controller_test.go b/csi/controller_test.go
@@ -1333,7 +1333,7 @@ func TestControllerCreateVolumeBadSnapshot(t *testing.T) {
 		// Return an error from snapshot
 		s.MockDriver().
 			EXPECT().
-			Snapshot(gomock.Any(), parent, false, &api.VolumeLocator{Name: name, VolumeLabels: nil}, false).
+			Snapshot(gomock.Any(), parent, false, &api.VolumeLocator{Name: name, VolumeLabels: map[string]string{api.SpecParent: parent}}, false).
 			Return("", fmt.Errorf("snapshoterr")).
 			Times(1),
 	)
@@ -2163,7 +2163,8 @@ func TestControllerCreateVolumeSnapshotThroughParameters(t *testing.T) {
 		s.MockDriver().
 			EXPECT().
 			Snapshot(gomock.Any(), mockParentID, false, &api.VolumeLocator{
-				Name: name,
+				Name:         name,
+				VolumeLabels: map[string]string{api.SpecParent: mockParentID},
 			},
 				false).
 			Return(id, nil).