Changeset 20576 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 15, 2009 5:32:38 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

48580

Message:

OVF: fix wrong OVF 1.0 namespace, more OVF 1.0 fixes for problems reported by IBM's OVF plugin for Eclipse

File:

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

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -2821 +2821 @@
         pelmRoot->setAttribute("xml:lang", "en-US");
 
-        Utf8Str strNamespace = (TaskWriteOVF::OVF_0_9)
+        Utf8Str strNamespace = (pTask->enFormat == TaskWriteOVF::OVF_0_9)
             ? "http://www.vmware.com/schema/ovf/1/envelope"     // 0.9
             : "http://schemas.dmtf.org/ovf/envelope/1";         // 1.0
@@ -3065 +3065 @@
             xml::ElementNode *pelmSystem = pelmVirtualHardwareSection->createChild("System");
 
+            pelmSystem->createChild("vssd:ElementName")->addContent("Virtual Hardware Family"); // required OVF 1.0
+
             // <vssd:InstanceId>0</vssd:InstanceId>
-            pelmSystem->createChild("vssd:InstanceId")->addContent("0");
+            if (pTask->enFormat == TaskWriteOVF::OVF_0_9)
+                pelmSystem->createChild("vssd:InstanceId")->addContent("0");
+            else // capitalization changed...
+                pelmSystem->createChild("vssd:InstanceID")->addContent("0");
+
             // <vssd:VirtualSystemIdentifier>VAtest</vssd:VirtualSystemIdentifier>
             pelmSystem->createChild("vssd:VirtualSystemIdentifier")->addContent(strVMName);
@@ -3179 +3185 @@
                             {
                                 strDescription = "IDE Controller";
+                                strCaption = "ideController0";
                                 type = OVFResourceType_IDEController; // 5
                                 strResourceSubType = desc.strVbox;
@@ -3425 +3432 @@
 
                         if (!strCaption.isEmpty())
+                        {
                             pItem->createChild("rasd:Caption")->addContent(strCaption);
+                            if (pTask->enFormat == TaskWriteOVF::OVF_1_0)
+                                pItem->createChild("rasd:ElementName")->addContent(strCaption);
+                        }
+
                         if (!strDescription.isEmpty())
                             pItem->createChild("rasd:Description")->addContent(strDescription);
@@ -3462 +3474 @@
 
                         if (lBusNumber != -1)
-                            pItem->createChild("rasd:BusNumber")->addContent(Utf8StrFmt("%d", lBusNumber));
+                            if (pTask->enFormat == TaskWriteOVF::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)