Changeset 17965 in vbox

Timestamp:

Mar 16, 2009 6:36:34 PM (16 years ago)

Author:

vboxsync

Message:

OVF: import/export VM descriptions (comments)

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (6 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -154 +154 @@
 {
     Utf8Str             strName;                // copy of VirtualSystem/@id
+
+    Utf8Str             strDescription;         // copy of VirtualSystem/Info content
 
     CIMOSType_T         cimos;
@@ -692 +694 @@
         const char *pcszTypeAttr = (pTypeAttr) ? pTypeAttr->getValue() : "";
 
-        if (!strcmp(pcszElemName, "EulaSection"))
+        if (!strcmp(pcszElemName, "Info"))
+        {
+            // the "Info" section directly under VirtualSystem is where our export routine
+            // chooses to save the VM description (comments), so re-import it from there too
+            vsys.strDescription = pelmThis->getValue();
+        }
+        else if (!strcmp(pcszElemName, "EulaSection"))
         {
          /* <EulaSection>
@@ -1293 +1301 @@
                                nameVBox);
 
+            if (!vsysThis.strDescription.isEmpty())
+                pNewDesc->addEntry(VirtualSystemDescriptionType_Description,
+                                    "",
+                                    vsysThis.strDescription,
+                                    vsysThis.strDescription);
+
             /* Now that we know the OS type, get our internal defaults based on that. */
             ComPtr<IGuestOSType> pGuestOSType;
@@ -1884 +1898 @@
                                                  pNewMachine.asOutParam());
             if (FAILED(rc)) throw rc;
+
+            // and the description
+            std::list<VirtualSystemDescriptionEntry*> vsdeDescription = vsdescThis->findByType(VirtualSystemDescriptionType_Description);
+            if (vsdeDescription.size())
+            {
+                const Utf8Str &strDescription = vsdeDescription.front()->strVbox;
+                rc = pNewMachine->COMSETTER(Description)(Bstr(strDescription));
+                if (FAILED(rc)) throw rc;
+            }
 
             if (!task->progress.isNull())
@@ -2534 +2557 @@
 
             xml::ElementNode *pelmVirtualSystem = pelmVirtualSystemCollection->createChild("VirtualSystem");
-            /* xml::ElementNode *pelmVirtualSystemInfo = */ pelmVirtualSystem->createChild("Info");      // @todo put in description here after implementing an entry for it
+
+            xml::ElementNode *pelmVirtualSystemInfo = pelmVirtualSystem->createChild("Info");
+            std::list<VirtualSystemDescriptionEntry*> llDescription = vsdescThis->findByType(VirtualSystemDescriptionType_Description);
+            if (llDescription.size())
+                pelmVirtualSystemInfo->addContent(llDescription.front()->strVbox);
 
             std::list<VirtualSystemDescriptionEntry*> llName = vsdescThis->findByType(VirtualSystemDescriptionType_Name);
@@ -3474 +3501 @@
                            strVMName);
 
+        // description
+        Utf8Str strDescription(bstrDescription);
+        pNewDesc->addEntry(VirtualSystemDescriptionType_Description,
+                           "",
+                           strDescription,
+                           strDescription);
+
         /* CPU count*/
         Utf8Str strCpuCount = Utf8StrFmt("%RI32", cCPUs);

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -2952 +2952 @@
   >
     <desc>
-      OVF resource type.
+        OVF resource type (as listed with CIM_ResourceAllocationSettingData; see for example
+        http://msdn.microsoft.com/en-us/library/cc136877(VS.85).aspx).
     </desc>
 
@@ -3207 +3208 @@
     <const name="OS" value="2" />
     <const name="Name" value="3" />
-    <const name="CPU" value="4" />
-    <const name="Memory" value="5" />
-    <const name="HardDiskControllerIDE" value="6" />
-    <const name="HardDiskControllerSATA" value="7" />
-    <const name="HardDiskControllerSCSI" value="8" />
-    <const name="HardDiskImage" value="9" />
-    <const name="Floppy" value="10" />
-    <const name="CDROM" value="11" />
-    <const name="NetworkAdapter" value="12" />
-    <const name="USBController" value="13" />
-    <const name="SoundCard" value="14" />
+    <const name="Description" value="4" />
+    <const name="CPU" value="5" />
+    <const name="Memory" value="6" />
+    <const name="HardDiskControllerIDE" value="7" />
+    <const name="HardDiskControllerSATA" value="8" />
+    <const name="HardDiskControllerSCSI" value="9" />
+    <const name="HardDiskImage" value="10" />
+    <const name="Floppy" value="11" />
+    <const name="CDROM" value="12" />
+    <const name="NetworkAdapter" value="13" />
+    <const name="USBController" value="14" />
+    <const name="SoundCard" value="15" />
 
   </enum>