From: Alwin Antreich <a.antreich@proxmox.com>
Date: Tue, 28 Apr 2020 13:58:20 +0000 (+0200)
Subject: Fix: path_to_volume_id returned wrong content
X-Git-Url: https://git.proxmox.com/?p=pve-storage.git;a=commitdiff_plain;h=892dc992490bb0b983699fd59bfa9d5e553d2eb5

Fix: path_to_volume_id returned wrong content

type for backup files. Patch includes changes of the test as well.

Signed-off-by: Alwin Antreich <a.antreich@proxmox.com>
---

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index bdd6ebc..1ef5ed2 100755
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -536,7 +536,7 @@ sub path_to_volume_id {
 	    return ('rootdir', "$sid:rootdir/$vmid");
 	} elsif ($path =~ m!^$backupdir/([^/]+\.(tar|tar\.gz|tar\.lzo|tgz|vma|vma\.gz|vma\.lzo))$!) {
 	    my $name = $1;
-	    return ('iso', "$sid:backup/$name");
+	    return ('backup', "$sid:backup/$name");
 	}
     }
 
diff --git a/test/path_to_volume_id_test.pm b/test/path_to_volume_id_test.pm
index 744c3ee..7d69869 100644
--- a/test/path_to_volume_id_test.pm
+++ b/test/path_to_volume_id_test.pm
@@ -72,7 +72,7 @@ my @tests = (
 	description => 'Backup, vma.gz',
 	volname     => "$storage_dir/dump/vzdump-qemu-16110-2020_03_30-21_11_40.vma.gz",
 	expected    => [
-	    'iso',
+	    'backup',
 	    'local:backup/vzdump-qemu-16110-2020_03_30-21_11_40.vma.gz',
 	],
     },
@@ -80,7 +80,7 @@ my @tests = (
 	description => 'Backup, vma.lzo',
 	volname     => "$storage_dir/dump/vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo",
 	expected    => [
-	    'iso',
+	    'backup',
 	    'local:backup/vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo',
 	],
     },
@@ -88,7 +88,7 @@ my @tests = (
 	description => 'Backup, vma',
 	volname     => "$storage_dir/dump/vzdump-qemu-16110-2020_03_30-21_13_55.vma",
 	expected    => [
-	    'iso',
+	    'backup',
 	    'local:backup/vzdump-qemu-16110-2020_03_30-21_13_55.vma',
 	],
     },
@@ -96,7 +96,7 @@ my @tests = (
 	description => 'Backup, tar.lzo',
 	volname     => "$storage_dir/dump/vzdump-lxc-16112-2020_03_30-21_39_30.tar.lzo",
 	expected    => [
-	    'iso',
+	    'backup',
 	    'local:backup/vzdump-lxc-16112-2020_03_30-21_39_30.tar.lzo',
 	],
     },