Changeset 49416 in vbox for trunk/src

Timestamp:

Nov 8, 2013 8:05:09 AM (11 years ago)

Author:

vboxsync

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

90475

Message:

pr7074. import logic for work with multiple VMs in OVF appliance was fixed.

File:

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

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

@@ -2107 +2107 @@
 }
 
-
 /**
  * Helper that converts VirtualSystem attachment values into VirtualBox attachment values.
@@ -3396 +3395 @@
     settings::StorageControllersList &llControllers = config.storageMachine.llStorageControllers;
     Guid hdUuid;
-    uint32_t cHardDisks = 0;
+    uint32_t cDisks = 0;
     bool fInconsistent = false;
     bool fRepairDuplicate = false;
@@ -3420 +3419 @@
             {
                 const Guid &thisUuid = it4->uuid;
-                cHardDisks++;
-                if (cHardDisks == 1)
+                cDisks++;
+                if (cDisks == 1)
                 {
                     if (hdUuid.isZero())
@@ -3440 +3439 @@
     }
     /* paranoia... */
-    if (fInconsistent || cHardDisks == 1)
+    if (fInconsistent || cDisks == 1)
         fRepairDuplicate = false;
 
@@ -3446 +3445 @@
      * step 2: scan the machine config for media attachments
      */
+
+    /* 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;
 
     /* Get all hard disk descriptions. */
@@ -3451 +3455 @@
     std::list<VirtualSystemDescriptionEntry*>::iterator avsdeHDsIt = avsdeHDs.begin();
     /* paranoia - if there is no 1:1 match do not try to repair. */
-    if (cHardDisks != avsdeHDs.size())
+    if (cDisks != avsdeHDs.size())
         fRepairDuplicate = false;
 
@@ -3459 +3463 @@
     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;
@@ -3481 +3487 @@
                 }
             }
+
             if (!vsdeTargetHD)
-                throw setError(E_FAIL,
-                               tr("Internal inconsistency looking up disk image '%s'"),
-                               oit->first.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;
+
+            }
         }
 
@@ -3554 +3566 @@
                     }
                     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'"),
@@ -3693 +3709 @@
                            strUuid.c_str());
 
+        ++cImportedDisks;
+
     }// 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()));
+    }
 
     /*