Changeset 49446 in vbox for trunk/src/VBox

Timestamp:

Nov 12, 2013 10:56:39 AM (11 years ago)

Author:

vboxsync

Message:

pr7074. import logic for work with multiple VMs in OVF appliance was fixed in the function importMachineGeneric().

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -2992 +2992 @@
             stack.fSessionOpen = true;
 
+            /* get VM name from virtual system description. Only one record is possible (size of list is equal 1). */
+            std::list<VirtualSystemDescriptionEntry*> vmName = vsdescThis->findByType(VirtualSystemDescriptionType_Name);
+            std::list<VirtualSystemDescriptionEntry*>::iterator vmNameIt = vmName.begin();
+            VirtualSystemDescriptionEntry* vmNameEntry = *vmNameIt;
+
             ovf::DiskImagesMap::const_iterator oit = stack.mapDisks.begin();
             std::set<RTCString>  disksResolvedNames;
 
-            while(oit != stack.mapDisks.end())
+            uint32_t cImportedDisks = 0;
+
+            while(oit != stack.mapDisks.end() && cImportedDisks != avsdeHDs.size())
             {
                 ovf::DiskImage diCurrent = oit->second;
@@ -3023 +3030 @@
                     }
                     if (!vsdeTargetHD)
-                        throw setError(E_FAIL,
-                                       tr("Internal inconsistency looking up disk image '%s'"),
-                                       diCurrent.strHref.c_str());
+                    {
+                        /* possible case if a disk image belongs to other virtual system (OVF package with multiple VMs inside) */
+                        LogWarning(("OVA/OVF import: Disk image %s was missed during import of VM %s\n",
+                                    oit->first.c_str(), vmNameEntry->strOvf.c_str()));
+                        ++oit;
+                        continue;
+                    }
 
                     //diCurrent.strDiskId contains the disk identifier (e.g. "vmdisk1"), which should exist
@@ -3109 +3120 @@
                                 }
                                 if (!vsdeTargetHD)
+                                {
+                                    /*
+                                     * in this case it's an error because something wrong with OVF description file.
+                                     * May be VB imports OVA package with wrong file sequence inside the archive.
+                                     */
                                     throw setError(E_FAIL,
                                                    tr("Internal inconsistency looking up disk image '%s'"),
                                                    diCurrent.strHref.c_str());
+                                }
 
                                 itVDisk = vsysThis.mapVirtualDisks.find(diCurrent.strDiskId);
@@ -3214 +3231 @@
                 vsdeTargetHD->strVboxCurrent = savedVboxCurrent;
 
+                ++cImportedDisks;
+
             } // end while(oit != stack.mapDisks.end())
+
+            /*
+             * quantity of the imported disks isn't equal to the size of the avsdeHDs list.
+             */
+            if(cImportedDisks < avsdeHDs.size())
+            {
+                LogWarning(("Not all disk images were imported for VM %s. Check OVF description file.",
+                            vmNameEntry->strOvf.c_str()));
+            }
 
             // only now that we're done with all disks, close the session
@@ -3495 +3523 @@
                 ++oit;
                 continue;
-
             }
         }