Changeset 28957 in vbox

Timestamp:

May 2, 2010 6:42:58 PM (15 years ago)

Author:

vboxsync

Message:

Main/OVF: on export, fix vmdk format string spec and sort elements from rasd: namespace alphabetically (public bug #6612)

Location:

trunk/src/VBox/Main

Files:

• ApplianceImplExport.cpp (modified) (5 diffs)
• ApplianceImplImport.cpp (modified) (2 diffs)
• include/ovfreader.h (modified) (1 diff)

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -1212 +1212 @@
                 pItem = pelmVirtualHardwareSection->createChild("Item");
 
-                // NOTE: do not change the order of these items without good reason! While we don't care
-                // about ordering, VMware's ovftool does and fails if the items are not written in
-                // exactly this order, as stupid as it seems.
+                // NOTE: DO NOT CHANGE THE ORDER of these items! The OVF standards prescribes that
+                // the elements from the rasd: namespace must be sorted by letter, and VMware
+                // actually requires this as well (see public bug #6612)
+
+                if (lAddress != -1)
+                    pItem->createChild("rasd:Address")->addContent(Utf8StrFmt("%d", lAddress));
+
+                if (lAddressOnParent != -1)
+                    pItem->createChild("rasd:AddressOnParent")->addContent(Utf8StrFmt("%d", lAddressOnParent));
+
+                if (!strAllocationUnits.isEmpty())
+                    pItem->createChild("rasd:AllocationUnits")->addContent(strAllocationUnits);
+
+                if (lAutomaticAllocation != -1)
+                    pItem->createChild("rasd:AutomaticAllocation")->addContent( (lAutomaticAllocation) ? "true" : "false" );
+
+                if (lBusNumber != -1)
+                    if (enFormat == OVF_0_9) // BusNumber is invalid OVF 1.0 so only write it in 0.9 mode for OVFTool compatibility
+                        pItem->createChild("rasd:BusNumber")->addContent(Utf8StrFmt("%d", lBusNumber));
 
                 if (!strCaption.isEmpty())
-                {
                     pItem->createChild("rasd:Caption")->addContent(strCaption);
+
+                if (!strConnection.isEmpty())
+                    pItem->createChild("rasd:Connection")->addContent(strConnection);
+
+                if (!strDescription.isEmpty())
+                    pItem->createChild("rasd:Description")->addContent(strDescription);
+
+                if (!strCaption.isEmpty())
                     if (enFormat == OVF_1_0)
                         pItem->createChild("rasd:ElementName")->addContent(strCaption);
-                }
-
-                if (!strDescription.isEmpty())
-                    pItem->createChild("rasd:Description")->addContent(strDescription);
+
+                if (!strHostResource.isEmpty())
+                    pItem->createChild("rasd:HostResource")->addContent(strHostResource);
 
                 // <rasd:InstanceID>1</rasd:InstanceID>
@@ -1234 +1256 @@
                 pelmInstanceID->addContent(Utf8StrFmt("%d", ulInstanceID++));
 
+                if (ulParent)
+                    pItem->createChild("rasd:Parent")->addContent(Utf8StrFmt("%d", ulParent));
+
                 // <rasd:ResourceType>3</rasd:ResourceType>
                 pItem->createChild("rasd:ResourceType")->addContent(Utf8StrFmt("%d", type));
@@ -1239 +1264 @@
                     pItem->createChild("rasd:ResourceSubType")->addContent(strResourceSubType);
 
-                if (!strHostResource.isEmpty())
-                    pItem->createChild("rasd:HostResource")->addContent(strHostResource);
-
-                if (!strAllocationUnits.isEmpty())
-                    pItem->createChild("rasd:AllocationUnits")->addContent(strAllocationUnits);
-
                 // <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
                 if (lVirtualQuantity != -1)
                     pItem->createChild("rasd:VirtualQuantity")->addContent(Utf8StrFmt("%d", lVirtualQuantity));
-
-                if (lAutomaticAllocation != -1)
-                    pItem->createChild("rasd:AutomaticAllocation")->addContent( (lAutomaticAllocation) ? "true" : "false" );
-
-                if (!strConnection.isEmpty())
-                    pItem->createChild("rasd:Connection")->addContent(strConnection);
-
-                if (lAddress != -1)
-                    pItem->createChild("rasd:Address")->addContent(Utf8StrFmt("%d", lAddress));
-
-                if (lBusNumber != -1)
-                    if (enFormat == OVF_0_9) // BusNumber is invalid OVF 1.0 so only write it in 0.9 mode for OVFTool compatibility
-                        pItem->createChild("rasd:BusNumber")->addContent(Utf8StrFmt("%d", lBusNumber));
-
-                if (ulParent)
-                    pItem->createChild("rasd:Parent")->addContent(Utf8StrFmt("%d", ulParent));
-                if (lAddressOnParent != -1)
-                    pItem->createChild("rasd:AddressOnParent")->addContent(Utf8StrFmt("%d", lAddressOnParent));
             }
         }
@@ -1351 +1352 @@
             <DiskSection>
                 <Info>List of the virtual disks used in the package</Info>
-                <Disk ovf:capacity="4294967296" ovf:diskId="lamp" ovf:format="http://www.vmware.com/specifications/vmdk.html#compressed" ovf:populatedSize="1924967692"/>
+                <Disk ovf:capacity="4294967296" ovf:diskId="lamp" ovf:format="..." ovf:populatedSize="1924967692"/>
             </DiskSection> */
         xml::ElementNode *pelmDiskSection;
@@ -1541 +1542 @@
 
             // add disk to XML Disks section
-            // <Disk ovf:capacity="8589934592" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/specifications/vmdk.html#sparse"/>
+            // <Disk ovf:capacity="8589934592" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="..."/>
             xml::ElementNode *pelmDisk = pelmDiskSection->createChild("Disk");
             pelmDisk->setAttribute("ovf:capacity", Utf8StrFmt("%RI64", cbCapacity).c_str());
             pelmDisk->setAttribute("ovf:diskId", strDiskID);
             pelmDisk->setAttribute("ovf:fileRef", strFileRef);
-            pelmDisk->setAttribute("ovf:format", "http://www.vmware.com/specifications/vmdk.html#sparse");      // must be sparse or ovftool chokes
+            pelmDisk->setAttribute("ovf:format",
+                    (enFormat == OVF_0_9)
+                        ?  "http://www.vmware.com/specifications/vmdk.html#sparse"      // must be sparse or ovftool chokes
+                        :  "http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized"
+                                                                                    // correct string as communicated to us by VMware (public bug #6612)
+                                  );
             pelmDisk->setAttribute("vbox:uuid", Utf8StrFmt("%RTuuid", guidSource.raw()).c_str());
         }

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -491 +491 @@
                     //  - we need a url specifier for the vdi format
                     if (   di.strFormat.compare("http://www.vmware.com/specifications/vmdk.html#sparse", Utf8Str::CaseInsensitive)
+                        || di.strFormat.compare("http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized", Utf8Str::CaseInsensitive)
                         || di.strFormat.compare("http://www.vmware.com/specifications/vmdk.html#compressed", Utf8Str::CaseInsensitive)
+                        || di.strFormat.compare("http://www.vmware.com/interfaces/specifications/vmdk.html#compressed", Utf8Str::CaseInsensitive)
                        )
                     {
@@ -1286 +1288 @@
             Bstr srcFormat = L"VDI";
             if (   di.strFormat.compare("http://www.vmware.com/specifications/vmdk.html#sparse", Utf8Str::CaseInsensitive)
+                || di.strFormat.compare("http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized", Utf8Str::CaseInsensitive)
                 || di.strFormat.compare("http://www.vmware.com/specifications/vmdk.html#compressed", Utf8Str::CaseInsensitive)
-            )
+                || di.strFormat.compare("http://www.vmware.com/interfaces/specifications/vmdk.html#compressed", Utf8Str::CaseInsensitive)
+               )
                 srcFormat = L"VMDK";
             // create an empty hard disk

trunk/src/VBox/Main/include/ovfreader.h

@@ -156 +156 @@
                                     // space, but cannot be larger than iCapacity; -1 if not set)
     iprt::MiniString strFormat;              // value from DiskSection/Disk/@format
-                // typically http://www.vmware.com/specifications/vmdk.html#sparse
+                // typically http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized
     iprt::MiniString uuidVbox;      // optional; if the file was exported by VirtualBox >= 3.2,
                                     // then this has the UUID with which the disk was registered