Changeset 18627 in vbox for trunk/src

Timestamp:

Apr 2, 2009 11:15:36 AM (16 years ago)

Author:

vboxsync

Message:

OVF: fix OVF 0.9 output to make ovftool happy

File:

• trunk/src/VBox/Main/ApplianceImpl.cpp (modified) (9 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -2574 +2574 @@
         pelmRoot->setAttribute("ovf:version", (task->enFormat == TaskWriteOVF::OVF_1_0) ? "1.0" : "0.9");
         pelmRoot->setAttribute("xml:lang", "en-US");
-        pelmRoot->setAttribute("xmlns", "http://schemas.dmtf.org/ovf/envelope/1");
-        pelmRoot->setAttribute("xmlns:ovf", "http://schemas.dmtf.org/ovf/envelope/1");
+
+        Utf8Str strNamespace = (TaskWriteOVF::OVF_0_9)
+            ? "http://www.vmware.com/schema/ovf/1/envelope"     // 0.9
+            : "http://schemas.dmtf.org/ovf/envelope/1";         // 1.0
+        pelmRoot->setAttribute("xmlns", strNamespace);
+        pelmRoot->setAttribute("xmlns:ovf", strNamespace);
+
 //         pelmRoot->setAttribute("xmlns:ovfstr", "http://schema.dmtf.org/ovf/strings/1");
         pelmRoot->setAttribute("xmlns:rasd", "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData");
@@ -2631 +2636 @@
 
         // and here come the virtual systems:
-        xml::ElementNode *pelmVirtualSystemCollection;
-        if (task->enFormat == TaskWriteOVF::OVF_0_9)
+
+        // write a collection if we have more than one virtual system _and_ we're
+        // writing OVF 1.0; otherwise fail since ovftool can't import more than
+        // one machine, it seems
+        xml::ElementNode *pelmToAddVirtualSystemsTo;
+        if (pAppliance->m->virtualSystemDescriptions.size() > 1)
         {
-            // <Section xsi:type="ovf:NetworkSection_Type">
-            pelmVirtualSystemCollection = pelmRoot->createChild("Content");
-            pelmVirtualSystemCollection->setAttribute("xsi:type", "ovf:VirtualSystemCollection_Type");
+            if (task->enFormat == TaskWriteOVF::OVF_0_9)
+                return setError(VBOX_E_FILE_ERROR,
+                                tr("Cannot export more than one virtual system with OVF 0.9, use OVF 1.0"));
+
+            pelmToAddVirtualSystemsTo = pelmRoot->createChild("VirtualSystemCollection");
+            /* xml::AttributeNode *pattrVirtualSystemCollectionId = */ pelmToAddVirtualSystemsTo->setAttribute("ovf:name", "ExportedVirtualBoxMachines");      // whatever
         }
         else
-            pelmVirtualSystemCollection = pelmRoot->createChild("VirtualSystemCollection");
-        /* xml::AttributeNode *pattrVirtualSystemCollectionId = */ pelmVirtualSystemCollection->setAttribute("ovf:id", "ExportedVirtualBoxMachines");      // whatever
+            pelmToAddVirtualSystemsTo = pelmRoot;       // add virtual system directly under root element
 
         list< ComObjPtr<VirtualSystemDescription> >::const_iterator it;
@@ -2654 +2665 @@
             {
                 // <Section xsi:type="ovf:NetworkSection_Type">
-                pelmVirtualSystem = pelmVirtualSystemCollection->createChild("Content");
+                pelmVirtualSystem = pelmToAddVirtualSystemsTo->createChild("Content");
                 pelmVirtualSystem->setAttribute("xsi:type", "ovf:VirtualSystem_Type");
             }
             else
-                pelmVirtualSystem = pelmVirtualSystemCollection->createChild("VirtualSystem");
+                pelmVirtualSystem = pelmToAddVirtualSystemsTo->createChild("VirtualSystem");
 
             /*xml::ElementNode *pelmVirtualSystemInfo =*/ pelmVirtualSystem->createChild("Info")->addContent("A virtual machine");
@@ -2811 +2822 @@
             pelmSystem->createChild("vssd:VirtualSystemIdentifier")->addContent(strVMName);
             // <vssd:VirtualSystemType>vmx-4</vssd:VirtualSystemType>
-            pelmSystem->createChild("vssd:VirtualSystemType")->addContent("virtualbox-2.2");            // instead of vmx-7?
+            const char *pcszHardware = "virtualbox-2.2";
+            if (task->enFormat == TaskWriteOVF::OVF_0_9)
+                // pretend to be vmware compatible then
+                pcszHardware = "vmx-6";
+            pelmSystem->createChild("vssd:VirtualSystemType")->addContent(pcszHardware);
 
             // loop thru all description entries twice; once to write out all
@@ -2898 +2913 @@
                                 lVirtualQuantity = (int32_t)(uTemp / _1M);
                                 strAllocationUnits = "MegaBytes";
+                                strCaption = Utf8StrFmt("%d MB of memory", lVirtualQuantity);     // without this ovftool won't eat the item
                             }
                         break;
@@ -3154 +3170 @@
                         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.
+
+                        if (!strCaption.isEmpty())
+                            pItem->createChild("rasd:Caption")->addContent(strCaption);
                         if (!strDescription.isEmpty())
                             pItem->createChild("rasd:Description")->addContent(strDescription);
-                        if (!strCaption.isEmpty())
-                            pItem->createChild("rasd:Caption")->addContent(strCaption);
-
-                        if (!strAllocationUnits.isEmpty())
-                            pItem->createChild("rasd:AllocationUnits")->addContent(strAllocationUnits);
-
-                        if (lAutomaticAllocation != -1)
-                            pItem->createChild("rasd:AutomaticAllocation")->addContent( (lAutomaticAllocation) ? "true" : "false" );
-
-                        if (!strConnection.isEmpty())
-                            pItem->createChild("rasd:Connection")->addContent(strConnection);
 
                         // <rasd:InstanceID>1</rasd:InstanceID>
-                        pItem->createChild("rasd:InstanceID")->addContent(Utf8StrFmt("%d", ulInstanceID));
-                        ++ulInstanceID;
+                        xml::ElementNode *pelmInstanceID;
+                        if (task->enFormat == TaskWriteOVF::OVF_0_9)
+                            pelmInstanceID = pItem->createChild("rasd:InstanceId");
+                        else
+                            pelmInstanceID = pItem->createChild("rasd:InstanceID");      // capitalization changed...
+                        pelmInstanceID->addContent(Utf8StrFmt("%d", ulInstanceID++));
 
                         // <rasd:ResourceType>3</rasd:ResourceType>
@@ -3177 +3192 @@
                             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)
@@ -3191 +3218 @@
                         if (lAddressOnParent != -1)
                             pItem->createChild("rasd:AddressOnParent")->addContent(Utf8StrFmt("%d", lAddressOnParent));
-
-                        if (!strHostResource.isEmpty())
-                            pItem->createChild("rasd:HostResource")->addContent(strHostResource);
                     }
                 }
@@ -3307 +3331 @@
             pelmDisk->setAttribute("ovf:diskId", strDiskID);
             pelmDisk->setAttribute("ovf:fileRef", strFileRef);
-            pelmDisk->setAttribute("ovf:format", "http://www.vmware.com/specifications/vmdk.html#compressed");
+            pelmDisk->setAttribute("ovf:format", "http://www.vmware.com/specifications/vmdk.html#sparse");      // must be sparse or ovftool chokes
         }