Added a LOG_EXT constant as a counterpart to NOTES_EXT

and refactored usages for .log and .notes with them.
At some parts in the test case code I had to source new variables to
shorten the line length to not exceed the 100 column line limit.

Signed-off-by: Daniel Tschlatscher <d.tschlatscher@proxmox.com>
Reviewed-by: Fabian Ebner <f.ebner@proxmox.com>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 0d53ba211437e9eab46d433dd05f0263226ecdef..b9c53a11dda2f4fdd94c1298535b02385c6d172b 100755 (executable)
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -1566,8 +1566,8 @@ sub archive_info {
        $info->{type} = $type;
 
        if ($volid =~ /^(vzdump-${type}-([1-9][0-9]{2,8})-(\d{4})_(\d{2})_(\d{2})-(\d{2})_(\d{2})_(\d{2}))\.${extension}$/) {
-           $info->{logfilename} = "$1.log";
-           $info->{notesfilename} = "$filename.notes";
+           $info->{logfilename} = "$1".PVE::Storage::Plugin::LOG_EXT;
+           $info->{notesfilename} = "$filename".PVE::Storage::Plugin::NOTES_EXT;
            $info->{vmid} = int($2);
            $info->{ctime} = timelocal($8, $7, $6, $5, $4 - 1, $3);
            $info->{is_std_name} = 1;

diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm
index 0a100b7b05a257afa0aab65ae5f9260e9ad0a09a..8a41df10b94b7112bf566561409305505fc8e67c 100644 (file)
--- a/PVE/Storage/Plugin.pm
+++ b/PVE/Storage/Plugin.pm
@@ -20,6 +20,7 @@ use base qw(PVE::SectionConfig);
 
 use constant COMPRESSOR_RE => 'gz|lzo|zst';
 
+use constant LOG_EXT => ".log";
 use constant NOTES_EXT => ".notes";
 
 our @COMMON_TAR_FLAGS = qw(

diff --git a/test/archive_info_test.pm b/test/archive_info_test.pm
index bbc0e6fb35e40997deedb0f1de2c3f59d22acfe2..cf03c3d855aa07f20998253511edd2e2e6f9c783 100644 (file)
--- a/test/archive_info_test.pm
+++ b/test/archive_info_test.pm
@@ -10,6 +10,9 @@ use Test::More;
 
 my $vmid = 16110;
 
+my $LOG_EXT = PVE::Storage::Plugin::LOG_EXT;
+my $NOTES_EXT = PVE::Storage::Plugin::NOTES_EXT;
+
 # an array of test cases, each test is comprised of the following keys:
 # description => to identify a single test
 # archive     => the input filename for archive_info
@@ -23,8 +26,8 @@ my $tests = [
        archive     => "backup/vzdump-lxc-$vmid-3070_01_01-00_00_00.tgz",
        expected    => {
            'filename'     => "vzdump-lxc-$vmid-3070_01_01-00_00_00.tgz",
-           'logfilename'  => "vzdump-lxc-$vmid-3070_01_01-00_00_00.log",
-           'notesfilename'=> "vzdump-lxc-$vmid-3070_01_01-00_00_00.tgz.notes",
+           'logfilename'  => "vzdump-lxc-$vmid-3070_01_01-00_00_00".$LOG_EXT,
+           'notesfilename'=> "vzdump-lxc-$vmid-3070_01_01-00_00_00.tgz".$NOTES_EXT,
            'type'         => 'lxc',
            'format'       => 'tar',
            'decompressor' => ['tar', '-z'],
@@ -39,8 +42,8 @@ my $tests = [
        archive     => "backup/vzdump-lxc-$vmid-1970_01_01-02_00_30.tgz",
        expected    => {
            'filename'     => "vzdump-lxc-$vmid-1970_01_01-02_00_30.tgz",
-           'logfilename'  => "vzdump-lxc-$vmid-1970_01_01-02_00_30.log",
-           'notesfilename'=> "vzdump-lxc-$vmid-1970_01_01-02_00_30.tgz.notes",
+           'logfilename'  => "vzdump-lxc-$vmid-1970_01_01-02_00_30".$LOG_EXT,
+           'notesfilename'=> "vzdump-lxc-$vmid-1970_01_01-02_00_30.tgz".$NOTES_EXT,
            'type'         => 'lxc',
            'format'       => 'tar',
            'decompressor' => ['tar', '-z'],
@@ -55,8 +58,8 @@ my $tests = [
        archive     => "backup/vzdump-lxc-$vmid-2020_03_30-21_39_30.tgz",
        expected    => {
            'filename'     => "vzdump-lxc-$vmid-2020_03_30-21_39_30.tgz",
-           'logfilename'  => "vzdump-lxc-$vmid-2020_03_30-21_39_30.log",
-           'notesfilename'=> "vzdump-lxc-$vmid-2020_03_30-21_39_30.tgz.notes",
+           'logfilename'  => "vzdump-lxc-$vmid-2020_03_30-21_39_30".$LOG_EXT,
+           'notesfilename'=> "vzdump-lxc-$vmid-2020_03_30-21_39_30.tgz".$NOTES_EXT,
            'type'         => 'lxc',
            'format'       => 'tar',
            'decompressor' => ['tar', '-z'],
@@ -71,8 +74,8 @@ my $tests = [
        archive     => "backup/vzdump-openvz-$vmid-2020_03_30-21_39_30.tgz",
        expected    => {
            'filename'     => "vzdump-openvz-$vmid-2020_03_30-21_39_30.tgz",
-           'logfilename'  => "vzdump-openvz-$vmid-2020_03_30-21_39_30.log",
-           'notesfilename'=> "vzdump-openvz-$vmid-2020_03_30-21_39_30.tgz.notes",
+           'logfilename'  => "vzdump-openvz-$vmid-2020_03_30-21_39_30".$LOG_EXT,
+           'notesfilename'=> "vzdump-openvz-$vmid-2020_03_30-21_39_30.tgz".$NOTES_EXT,
            'type'         => 'openvz',
            'format'       => 'tar',
            'decompressor' => ['tar', '-z'],
@@ -87,8 +90,8 @@ my $tests = [
        archive     => "/here/be/Back-ups/vzdump-qemu-$vmid-2020_03_30-21_39_30.tgz",
        expected    => {
            'filename'     => "vzdump-qemu-$vmid-2020_03_30-21_39_30.tgz",
-           'logfilename'  => "vzdump-qemu-$vmid-2020_03_30-21_39_30.log",
-           'notesfilename'=> "vzdump-qemu-$vmid-2020_03_30-21_39_30.tgz.notes",
+           'logfilename'  => "vzdump-qemu-$vmid-2020_03_30-21_39_30".$LOG_EXT,
+           'notesfilename'=> "vzdump-qemu-$vmid-2020_03_30-21_39_30.tgz".$NOTES_EXT,
            'type'         => 'qemu',
            'format'       => 'tar',
            'decompressor' => ['tar', '-z'],
@@ -135,15 +138,16 @@ my $bkp_suffix = {
 # create more test cases for backup files matches
 for my $virt (sort keys %$bkp_suffix) {
     my ($format, $decomp) = $bkp_suffix->{$virt}->@*;
+    my $archive_name = "vzdump-$virt-$vmid-2020_03_30-21_12_40";
 
     for my $suffix (sort keys %$decomp) {
        push @$tests, {
            description => "Backup archive, $virt, $format.$suffix",
-           archive     => "backup/vzdump-$virt-$vmid-2020_03_30-21_12_40.$format.$suffix",
+           archive     => "backup/$archive_name.$format.$suffix",
            expected    => {
-               'filename'     => "vzdump-$virt-$vmid-2020_03_30-21_12_40.$format.$suffix",
-               'logfilename'  => "vzdump-$virt-$vmid-2020_03_30-21_12_40.log",
-               'notesfilename'=> "vzdump-$virt-$vmid-2020_03_30-21_12_40.$format.$suffix.notes",
+               'filename'     => "$archive_name.$format.$suffix",
+               'logfilename'  => $archive_name.$LOG_EXT,
+               'notesfilename'=> "$archive_name.$format.$suffix".$NOTES_EXT,
                'type'         => "$virt",
                'format'       => "$format",
                'decompressor' => $decomp->{$suffix},