Changeset 18052 in vbox

Timestamp:

Mar 18, 2009 9:56:49 AM (16 years ago)

Author:

vboxsync

Message:

OVF: use AnnotationSection for VM description, don't fail on export if XML file exists

Location:

trunk

Files:

• include/VBox/xml.h (modified) (1 diff)
• src/VBox/Main/ApplianceImpl.cpp (modified) (7 diffs)
• src/VBox/Main/xml/xml.cpp (modified) (2 diffs)

trunk/include/VBox/xml.h

@@ -298 +298 @@
      * Possible file access modes.
      */
-    enum Mode { Mode_Read, Mode_Write, Mode_ReadWrite };
+    enum Mode { Mode_Read, Mode_WriteCreate, Mode_Overwrite, Mode_ReadWrite };
 
     /**

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -508 +508 @@
                 return rc;
         }
-       else if (    (!strcmp(pcszElemName, "NetworkSection"))            // we ignore NetworkSections for now
+       else if (    (!strcmp(pcszElemName, "NetworkSection"))
                   || (    (!strcmp(pcszElemName, "Section"))
                        && (!strcmp(pcszTypeAttr, "ovf:NetworkSection_Type"))
@@ -517 +517 @@
                 return rc;
         }
-        else if (    (!strcmp(pcszElemName, "DeploymentOptionSection>")))
+        else if (    (!strcmp(pcszElemName, "DeploymentOptionSection")))
         {
             // TODO
@@ -694 +694 @@
         const char *pcszTypeAttr = (pTypeAttr) ? pTypeAttr->getValue() : "";
 
-        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"))
+        if (!strcmp(pcszElemName, "EulaSection"))
         {
          /* <EulaSection>
@@ -1063 +1057 @@
             vsys.cimos = (CIMOSType_T)cimos64;
         }
+        else if (    (!strcmp(pcszElemName, "AnnotationSection"))
+                  || (!strcmp(pcszTypeAttr, "ovf:AnnotationSection_Type"))
+                )
+        {
+            const xml::ElementNode *pelmAnnotation;
+            if ((pelmAnnotation = pelmThis->findChildElement("Annotation")))
+                vsys.strDescription = pelmAnnotation->getValue();
+        }
     }
 
@@ -2561 +2563 @@
         pelmRoot->setAttribute("xsi:schemaLocation", "http://schemas.dmtf.org/ovf/envelope/1 ../ovf-envelope.xsd");
 
-
         // <Envelope>/<References>
         xml::ElementNode *pelmReferences = pelmRoot->createChild("References");
-                // @ŧodo
 
         /* <Envelope>/<DiskSection>:
@@ -2607 +2607 @@
             xml::ElementNode *pelmVirtualSystem = pelmVirtualSystemCollection->createChild("VirtualSystem");
 
-            xml::ElementNode *pelmVirtualSystemInfo = pelmVirtualSystem->createChild("Info");
-            std::list<VirtualSystemDescriptionEntry*> llDescription = vsdescThis->findByType(VirtualSystemDescriptionType_Description);
-            if (llDescription.size())
-                pelmVirtualSystemInfo->addContent(llDescription.front()->strVbox);
+            /*xml::ElementNode *pelmVirtualSystemInfo =*/ pelmVirtualSystem->createChild("Info")->addContent("A virtual machine");
 
             std::list<VirtualSystemDescriptionEntry*> llName = vsdescThis->findByType(VirtualSystemDescriptionType_Name);
@@ -2618 +2615 @@
             pelmVirtualSystem->setAttribute("ovf:id", llName.front()->strVbox);
 
+            // description
+            std::list<VirtualSystemDescriptionEntry*> llDescription = vsdescThis->findByType(VirtualSystemDescriptionType_Description);
+            if (llDescription.size())
+            {
+                /*  <Section ovf:required="false" xsi:type="ovf:AnnotationSection_Type">
+                        <Info>A human-readable annotation</Info>
+                        <Annotation>Plan 9</Annotation>
+                    </Section> */
+                xml::ElementNode *pelmAnnotationSection = pelmVirtualSystem->createChild("AnnotationSection");
+                pelmAnnotationSection->createChild("Info")->addContent("A human-readable annotation");
+                pelmAnnotationSection->createChild("Annotation")->addContent(llDescription.front()->strVbox);
+            }
+
+            // operating system
             std::list<VirtualSystemDescriptionEntry*> llOS = vsdescThis->findByType(VirtualSystemDescriptionType_OS);
             if (llOS.size() != 1)

trunk/src/VBox/Main/xml/xml.cpp

@@ -184 +184 @@
             flags = RTFILE_O_READ;
             break;
-        case Mode_Write:
+        case Mode_WriteCreate:      // fail if file exists
             flags = RTFILE_O_WRITE | RTFILE_O_CREATE;
+            break;
+        case Mode_Overwrite:        // overwrite if file exists
+            flags = RTFILE_O_WRITE | RTFILE_O_CREATE_REPLACE;
             break;
         case Mode_ReadWrite:
@@ -1133 +1136 @@
 {
     WriteContext(const char *pcszFilename)
-        : IOContext(pcszFilename, File::Mode_Write)
+        : IOContext(pcszFilename, File::Mode_Overwrite)
     {
     }