Attachment 853938 Details for Bug 1056126 – Revised patch; split out byte-calculation into function

[patch] Revised patch; split out byte-calculation into function

proposed-1056126-2.patch (text/plain), 2.52 KB, created by Ronald van Zantvoort on 2014-01-22 16:13:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ronald van Zantvoort

Created: 2014-01-22 16:13:44 UTC

Size: 2.52 KB

patch

obsolete

>--- /usr/share/perl5/vendor_perl/Sys/VirtConvert/Connection/VMwareOVASource.pm	2013-08-09 00:02:58.000000000 +0200
>+++ ./VMwareOVASource-p1056126.pm	2014-01-22 17:10:06.697636259 +0100
>@@ -129,9 +129,17 @@
>     $meta{name} = _node_val($root, '/Envelope/VirtualSystem/Name/text()');
>     my ($memory) = $root->findnodes("/Envelope/VirtualSystem/VirtualHardwareSection/Item[rasd:ResourceType = $hw_families{Memory}]");
>     if (defined($memory)) {
>-        my $units = _node_val($memory, 'rasd:AllocationUnits/text()');
>-        $units =~ /^byte \* 2\^(\d+)$/ or die "Unexpected memory units: $units";
>-        $units = 2 ** $1;
>+        my $units;
>+
>+        $units = _node_val($memory, 'rasd:VirtualQuantityUnits/text()');
>+        
>+        #Officially AllocationUnits is only for the Reservation & Limit properties
>+        if(!defined($units)){
>+            $units = _node_val($memory, 'rasd:AllocationUnits/text()');
>+        }
>+
>+        $units = _get_byte_units($units);
>+        
>         $memory = _node_val($memory, 'rasd:VirtualQuantity/text()') * $units;
>     } else {
>         $memory = 1 * 1024 * 1024 * 1024; # Shouldn't happen, but default to 1GB RAM
>@@ -243,6 +251,43 @@
>     return $input_number;
> }
> 
>+#Translate a unit field into bytes per unit
>+sub _get_byte_units
>+{
>+        my $units = @_;
>+
>+        #$1 = kilo,mega,giga
>+        #$2 = s
>+        #$3 = group w/calc
>+        #$4 = 2 | 10 (^$5)
>+        #$5 = ^digit
>+        $units =~ /^(kilo|mega|giga){0,1}byte(s){0,1}([\s]*\*[\s]*(\d+)[\s]*\^[\s]*(\d+)){0,1}[\s]*$/i or die "Unexpected unit specification: $units";
>+       
>+        my $byte_size;
>+        #Can't find references in the OVA spec to binary/decimal counting,
>+        #other than that units are supposed to be logical.
>+        #In the case of any computer, binary logic is logical.
>+        #In the case of HD's and SI in general, HW vendors like decimal.
>+        #OVF doesn't seem to allow the -bi syntax, 
>+        #leaving the issue out to dry. I'm going to assume binary.
>+        if(defined($1)) {
>+            if ($1 =~ "[Kk]ilo"){
>+                $byte_size = 1024;
>+            } elsif ($1 =~ "[Mm]ega"){
>+                $byte_size = 1024 * 1024;
>+            } elsif ($1 =~ "[Gg]iga"){
>+                $byte_size = 1024 * 1024 * 1024;
>+            } else {
>+                die "Unexpected unit specification: $units";
>+            }
>+        } else {
>+            $byte_size = 1;
>+        }
>+        
>+        if(defined($3)) {
>+            $byte_size = $byte_size * $4 ** $5;
>+        }
>+}
> 
> # to double check for errors
>

Actions: View | Diff

Attachments on bug 1056126: 853338 | 853938