Changeset 32448 in vbox

Timestamp:

Sep 13, 2010 2:24:06 PM (14 years ago)

Author:

vboxsync

Message:

Main-OVF: make manifest file creation optional

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageImport.cpp (modified) (4 diffs)
• Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage4.ui (modified) (4 diffs)
• Main/ApplianceImpl.cpp (modified) (2 diffs)
• Main/ApplianceImplExport.cpp (modified) (6 diffs)
• Main/idl/VirtualBox.xidl (modified) (4 diffs)
• Main/include/ApplianceImpl.h (modified) (1 diff)
• Main/include/ApplianceImplPrivate.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -342 +342 @@
         RTPrintf("VBoxManage export           <machines> --output|-o <ovf>\n"
                  "                            [--legacy09]\n"
+                 "                            [--manifest]\n"
                  "                            [--vsys <number of virtual system>]\n"
                  "                                    [--product <product name>]\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageImport.cpp

@@ -726 +726 @@
         { "--output",             'o', RTGETOPT_REQ_STRING },
         { "--legacy09",           'l', RTGETOPT_REQ_NOTHING },
+        { "--manifest",           'm', RTGETOPT_REQ_NOTHING },
         { "--vsys",               's', RTGETOPT_REQ_UINT32 },
         { "--product",            'p', RTGETOPT_REQ_STRING },
@@ -742 +743 @@
     Utf8Str strOutputFile;
     Utf8Str strOvfFormat("ovf-1.0"); // the default export version
+    bool fManifest = false; // the default
     std::list< ComPtr<IMachine> > llMachines;
 
@@ -771 +773 @@
                 case 'l':   // --legacy09
                      strOvfFormat = "ovf-0.9";
+                break;
+
+                case 'm':   // --manifest
+                     fManifest = true;
                 break;
 
@@ -950 +956 @@
         else
             pszAbsFilePath = RTPathAbsDup(strOutputFile.c_str());
-        CHECK_ERROR_BREAK(pAppliance, Write(Bstr(strOvfFormat), Bstr(pszAbsFilePath), progress.asOutParam()));
+        CHECK_ERROR_BREAK(pAppliance, Write(Bstr(strOvfFormat), fManifest, Bstr(pszAbsFilePath), progress.asOutParam()));
         RTStrFree(pszAbsFilePath);
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp

@@ -530 +530 @@
     if (fi.suffix().toLower() == "ovf")
     {
-        files << fi.baseName() + ".mf";
+        if (m_pSelectManifest->isChecked())
+            files << fi.baseName() + ".mf";
         CVirtualSystemDescriptionVector vsds = appliance->GetVirtualSystemDescriptions();
         for (int i = 0; i < vsds.size(); ++ i)
@@ -600 +601 @@
     /* Write the appliance */
     const QString version = m_pSelectOVF09->isChecked() ? "ovf-0.9" : "ovf-1.0";
-    CProgress progress = appliance.Write(version, uri());
+    CProgress progress = appliance.Write(version, m_pSelectManifest->isChecked() /* fManifest */, uri());
     bool fResult = appliance.isOk();
     if (fResult)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage4.ui

@@ -2 +2 @@
 <ui version="4.0">
  <comment>
- VBox frontends: Qt4 GUI ("VirtualBox"):
+ VBox frontends: Qt4 GUI (&quot;VirtualBox&quot;):
 
      Copyright (C) 2009-2010 Oracle Corporation
@@ -10 +10 @@
      you can redistribute it and/or modify it under the terms of the GNU
      General Public License (GPL) as published by the Free Software
-     Foundation, in version 2 as it comes in the "COPYING" file of the
+     Foundation, in version 2 as it comes in the &quot;COPYING&quot; file of the
      VirtualBox OSE distribution. VirtualBox OSE is distributed in the
      hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
@@ -30 +30 @@
    </sizepolicy>
   </property>
-  <layout class="QVBoxLayout" name="m_pLayout1">
-   <property name="bottomMargin" >
-    <number>0</number>
-   </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QILabel" name="m_pPage4Text1">
@@ -140 +137 @@
    </item>
    <item>
+    <widget class="QCheckBox" name="m_pSelectManifest">
+     <property name="toolTip">
+      <string>Create a Manifest file for automatic data integrity checks on import.</string>
+     </property>
+     <property name="text">
+      <string>Write &amp;Manifest file</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <spacer name="m_pSpacer1">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>0</width>
-       <height>174</height>
+       <width>579</width>
+       <height>144</height>
       </size>
      </property>

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -825 +825 @@
         }
         case ImportFileWithManifest:
-        case WriteFile:
         {
             ++cOperations;          // another one for creating the manifest
@@ -832 +831 @@
             m->ulWeightForManifestOperation = m->ulTotalDisksMB / 10;
             ulTotalOperationsWeight += m->ulWeightForManifestOperation;
+            if (fOVA)
+            {
+                // Another operation for packing
+                ++cOperations;
+
+                // assume that packing the files into the archive has the same weight than creating all files in the ovf exporting step
+                ulTotalOperationsWeight += m->ulTotalDisksMB;
+            }
+            break;
+        }
+        case WriteFile:
+        {
+            // assume that creating the manifest will take 10% of the time it takes to export the disks
+            if (m->fManifest)
+            {
+                ++cOperations;          // another one for creating the manifest
+
+                m->ulWeightForManifestOperation = m->ulTotalDisksMB / 10;
+                ulTotalOperationsWeight += m->ulWeightForManifestOperation;
+            }
             if (fOVA)
             {

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -552 +552 @@
  * @return
  */
-STDMETHODIMP Appliance::Write(IN_BSTR format, IN_BSTR path, IProgress **aProgress)
+STDMETHODIMP Appliance::Write(IN_BSTR format, BOOL fManifest, IN_BSTR path, IProgress **aProgress)
 {
     if (!path) return E_POINTER;
@@ -573 +573 @@
                         tr("Appliance file must have .ovf or .ova extension"));
 
+    m->fManifest = !!fManifest;
     Utf8Str strFormat(format);
     OVFFormat ovfF;
@@ -1617 +1618 @@
         writer.write(pTask->locInfo.strPath.c_str(), false /*fSafe*/);
 
-        // Create & write the manifest file
-        Utf8Str strMfFile = manifestFileName(pTask->locInfo.strPath.c_str());
-        const char *pcszManifestFileOnly = RTPathFilename(strMfFile.c_str());
-        pTask->pProgress->SetNextOperation(BstrFmt(tr("Creating manifest file '%s'"), pcszManifestFileOnly),
-                                           m->ulWeightForManifestOperation);     // operation's weight, as set up with the IProgress originally);
-
-        const char** ppManifestFiles = (const char**)RTMemAlloc(sizeof(char*)*diskList.size() + 1);
-        ppManifestFiles[0] = pTask->locInfo.strPath.c_str();
-        list<Utf8Str>::const_iterator it1;
-        size_t i = 1;
-        for (it1 = diskList.begin();
-             it1 != diskList.end();
-             ++it1, ++i)
-            ppManifestFiles[i] = (*it1).c_str();
-        int vrc = RTManifestWriteFiles(strMfFile.c_str(), ppManifestFiles, diskList.size()+1, NULL, NULL);
-        RTMemFree(ppManifestFiles);
-        if (RT_FAILURE(vrc))
-            throw setError(VBOX_E_FILE_ERROR,
-                           tr("Could not create manifest file '%s' (%Rrc)"),
-                           pcszManifestFileOnly, vrc);
+        if (m->fManifest)
+        {
+            // Create & write the manifest file
+            Utf8Str strMfFile = manifestFileName(pTask->locInfo.strPath.c_str());
+            const char *pcszManifestFileOnly = RTPathFilename(strMfFile.c_str());
+            pTask->pProgress->SetNextOperation(BstrFmt(tr("Creating manifest file '%s'"), pcszManifestFileOnly),
+                                               m->ulWeightForManifestOperation);     // operation's weight, as set up with the IProgress originally);
+
+            const char** ppManifestFiles = (const char**)RTMemAlloc(sizeof(char*)*diskList.size() + 1);
+            ppManifestFiles[0] = pTask->locInfo.strPath.c_str();
+            list<Utf8Str>::const_iterator it1;
+            size_t i = 1;
+            for (it1 = diskList.begin();
+                 it1 != diskList.end();
+                 ++it1, ++i)
+                ppManifestFiles[i] = (*it1).c_str();
+            int vrc = RTManifestWriteFiles(strMfFile.c_str(), ppManifestFiles, diskList.size()+1, NULL, NULL);
+            RTMemFree(ppManifestFiles);
+            if (RT_FAILURE(vrc))
+                throw setError(VBOX_E_FILE_ERROR,
+                               tr("Could not create manifest file '%s' (%Rrc)"),
+                               pcszManifestFileOnly, vrc);
+        }
     }
     catch (iprt::Error &x)  // includes all XML exceptions
@@ -1720 +1724 @@
             throw setError(VBOX_E_FILE_ERROR,
                            tr("Cannot find source file '%s' (%Rrc)"), strTmpOvf.c_str(), vrc);
+        ULONG ulWeight = m->ulWeightForXmlOperation;
         /* Add the OVF file */
         filesList.push_back(strTmpOvf); /* Use 1% of the total for the OVF file upload */
-        Utf8Str strMfFile = manifestFileName(strTmpOvf);
-        filesList.push_back(strMfFile); /* Use 1% of the total for the manifest file upload */
-
-        ULONG ulWeight = 2 * m->ulWeightForXmlOperation;
+        /* Add the manifest file */
+        if (m->fManifest)
+        {
+            Utf8Str strMfFile = manifestFileName(strTmpOvf);
+            filesList.push_back(strMfFile); /* Use 1% of the total for the manifest file upload */
+            ulWeight += m->ulWeightForXmlOperation;
+        }
+
         /* Now add every disks of every virtual system */
         list< ComObjPtr<VirtualSystemDescription> >::const_iterator it;
@@ -1753 +1762 @@
             }
         }
+        ulWeight = m->ulTotalDisksMB;
         paFiles = (const char**)RTMemAlloc(sizeof(char*) * filesList.size());
         int i = 0;
@@ -1874 +1884 @@
         /* Add the OVF file */
         filesList.push_back(pair<Utf8Str, ULONG>(strTmpOvf, m->ulWeightForXmlOperation)); /* Use 1% of the total for the OVF file upload */
-        Utf8Str strMfFile = manifestFileName(strTmpOvf);
-        filesList.push_back(pair<Utf8Str, ULONG>(strMfFile , m->ulWeightForXmlOperation)); /* Use 1% of the total for the manifest file upload */
+        /* Add the manifest file */
+        if (m->fManifest)
+        {
+            Utf8Str strMfFile = manifestFileName(strTmpOvf);
+            filesList.push_back(pair<Utf8Str, ULONG>(strMfFile , m->ulWeightForXmlOperation)); /* Use 1% of the total for the manifest file upload */
+        }
 
         /* Now add every disks of every virtual system */

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

@@ -2391 +2391 @@
   <interface
      name="IAppliance" extends="$unknown"
-     uuid="fb61a4fc-57e7-48d6-859b-71f37d484cf2"
+     uuid="7b148032-4124-4f46-b56a-b48ac1273f5a"
      wsmap="managed"
      >
@@ -2621 +2621 @@
         </desc>
       </param>
+      <param name="manifest" type="boolean" dir="in">
+        <desc>
+            Indicate if the optional manifest file (.mf) should be written. The manifest file
+            is used for integrity checks prior import.
+        </desc>
+      </param>
       <param name="path" type="wstring" dir="in">
           <desc>
@@ -2627 +2633 @@
           </desc>
       </param>
-      <param name="aProgress" type="IProgress" dir="return">
+      <param name="progress" type="IProgress" dir="return">
         <desc>Progress object to track the operation completion.</desc>
       </param>
@@ -2633 +2639 @@
 
     <method name="getWarnings">
-        <desc>Returns textual warnings which occured during execution of <link to="#interpret" />.</desc>
+        <desc>Returns textual warnings which occurred during execution of <link to="#interpret" />.</desc>
 
         <param name="aWarnings" type="wstring" dir="return" safearray="yes">

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

@@ -93 +93 @@
     /* Export methods */
     STDMETHOD(CreateVFSExplorer)(IN_BSTR aURI, IVFSExplorer **aExplorer);
-    STDMETHOD(Write)(IN_BSTR format, IN_BSTR path, IProgress **aProgress);
+    STDMETHOD(Write)(IN_BSTR format, BOOL fManifest, IN_BSTR path, IProgress **aProgress);
 
     STDMETHOD(GetWarnings)(ComSafeArrayOut(BSTR, aWarnings));

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

@@ -48 +48 @@
 
     Data()
-      : state(ApplianceIdle),
-        pReader(NULL)
+      : state(ApplianceIdle)
+      , fManifest(true)
+      , pReader(NULL)
     {
     }
@@ -65 +66 @@
 
     LocationInfo        locInfo;        // location info for the currently processed OVF
+    bool                fManifest;      // Create a manifest file on export
 
     ovf::OVFReader      *pReader;