Pvc from source with different isi paths (#15)

* support to create pvc from snapshot with different isi path * removed temporary debug logs Co-authored-by: Bahubali Jain <[email protected]>
dell · Jan 10, 2022 · 83d13e1 · 83d13e1
1 parent 535fa50
commit 83d13e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/api/v1/api_v1_snapshots.go b/api/v1/api_v1_snapshots.go
@@ -123,14 +123,14 @@ func CopyIsiSnapshot(
 func CopyIsiSnapshotWithIsiPath(
 	ctx context.Context,
 	client api.Client,
-	isiPath, sourceSnapshotName, sourceVolume, destinationName string) (resp *IsiVolume, err error) {
+	isiPath, snapshotSourceVolumeIsiPath, sourceSnapshotName, sourceVolume, destinationName string) (resp *IsiVolume, err error) {
 	// PAPI calls: PUT https://1.2.3.4:8080/namespace/path/to/volumes/destination_volume_name?merge=True
 	//             x-isi-ifs-copy-source: /path/to/snapshot/volumes/source_volume_name
 	//             x-isi-ifs-mode-mask: preserve
 	headers := map[string]string{
 		"x-isi-ifs-copy-source": path.Join(
 			"/",
-			GetRealVolumeSnapshotPathWithIsiPath(isiPath, sourceSnapshotName),
+			GetRealVolumeSnapshotPathWithIsiPath(snapshotSourceVolumeIsiPath, sourceSnapshotName),
 			sourceVolume),
 		"x-isi-ifs-mode-mask": "preserve",
 	}

diff --git a/snapshots.go b/snapshots.go
@@ -139,7 +139,7 @@ func (c *Client) CopySnapshot(
 // CopySnapshotWithIsiPath copies all files/directories in a snapshot with isiPath to a new directory.
 func (c *Client) CopySnapshotWithIsiPath(
 	ctx context.Context,
-	isiPath string,
+	isiPath, snapshotSourceVolumeIsiPath string,
 	sourceID int64,
 	sourceName, destinationName string) (Volume, error) {
 
@@ -152,7 +152,7 @@ func (c *Client) CopySnapshotWithIsiPath(
 	}
 
 	_, err = api.CopyIsiSnapshotWithIsiPath(
-		ctx, c.API, isiPath, snapshot.Name,
+		ctx, c.API, isiPath, snapshotSourceVolumeIsiPath, snapshot.Name,
 		path.Base(snapshot.Path), destinationName)
 	if err != nil {
 		return nil, err