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 bdd6ebc2025747bb173b3e5c22ba89a9f8168b06..1ef5ed2c7f5d3ec709266567b1c9acb73d765d7e 100755 (executable)
--- 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 ('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 744c3ee5c7b61d1ee8dcf1b5e1749b3f54208ea5..7d698691efaa3e033bd8f9d77eaf3422814d1e26 100644 (file)
--- 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    => [
        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',
        ],
     },
            '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    => [
        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',
        ],
     },
            '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    => [
        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',
        ],
     },
            '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    => [
        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',
        ],
     },
            'local:backup/vzdump-lxc-16112-2020_03_30-21_39_30.tar.lzo',
        ],
     },