vmware: Fix References/File size for OVA disk

The file size issue in
coreos/fedora-coreos-tracker#391 isn't actually
about DiskSection/Disk/ovf:populatedSize; that property is only a hint.
The problem is that References/File/ovf:size should be the size of the
VMDK file in bytes, not its virtual capacity.

Change References/File/ovf:size to match the VMDK file size.  For
simplicity, change DiskSection/Disk/ovf:populatedSize to match.
Rename template variables to improve clarity.

Author: bgilbert

src/cosalib/vmware.py

@@ -70,6 +70,7 @@ def generate_ovf_parameters(self, vmdk, cpu=2,
         based on the qemu, vmdk, and info from the build metadata
         """
         disk_info = image_info(vmdk)
+        vmdk_size = os.stat(vmdk).st_size
         image = self.summary
         product = f'{self.meta["name"]} {self.summary}'
         vendor = self.meta['name']
@@ -86,8 +87,8 @@ def generate_ovf_parameters(self, vmdk, cpu=2,
             'vsphere_os_type':                  os_type,
             'vsphere_scsi_controller_type':     scsi,
             'vsphere_network_controller_type':  network,
-            'virtual_disk_size':                disk_info.get("virtual-size"),
-            'vmdk_size':                        disk_info.get("actual-size"),
+            'vmdk_capacity':                    disk_info.get("virtual-size"),
+            'vmdk_size':                        str(vmdk_size),
         }
 
         return params

src/vmware-template.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <Envelope xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vmw="http://www.vmware.com/schema/ovf" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" vmw:buildId="build-880146">
   <References>
-	  <File ovf:href="disk.vmdk" ovf:id="file1" ovf:size="{virtual_disk_size}"/>
+	  <File ovf:href="disk.vmdk" ovf:id="file1" ovf:size="{vmdk_size}"/>
   </References>
   <DiskSection>
     <Info>Virtual disk information</Info>
-    <Disk ovf:capacity="{virtual_disk_size}" ovf:capacityAllocationUnits="byte" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize="{vmdk_size}"/>
+    <Disk ovf:capacity="{vmdk_capacity}" ovf:capacityAllocationUnits="byte" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize="{vmdk_size}"/>
   </DiskSection>
   <NetworkSection>
     <Info>The list of logical networks</Info>