Changeset 49749 in vbox for trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

Timestamp:

Dec 3, 2013 12:29:19 PM (11 years ago)

Author:

vboxsync

Message:

pr7074. OVF import: Restoring original UUIDs of imported images in VM configuration settings in case of failure.

File:

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

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

@@ -1488 +1488 @@
     void *pvCertBuf = NULL;
     writeLock.release();
+
+    /* Create the import stack for the rollback on errors. */
+    ImportStack stack(pTask->locInfo, m->pReader->m_mapDisks, pTask->pProgress);
+
     try
     {
@@ -1507 +1511 @@
         if (RT_FAILURE(vrc))
             throw setError(VBOX_E_IPRT_ERROR, "Creation of the VD interface failed (%Rrc)", vrc);
-
-        /* Create the import stack for the rollback on errors. */
-        ImportStack stack(pTask->locInfo, m->pReader->m_mapDisks, pTask->pProgress);
 
         if (RTFileExists(strMfFile.c_str()))
@@ -1563 +1564 @@
     {
         rc = rc2;
+        /*
+         * Restoring original UUID from OVF description file.
+         * During import VB creates new UUIDs for imported images and 
+         * assigns them to the images. In case of failure we have to restore
+         * the original UUIDs because those new UUIDs are obsolete now and
+         * won't be used anymore.
+         */
+        {
+            list< ComObjPtr<VirtualSystemDescription> >::const_iterator itvsd;
+            /* Iterate through all virtual systems of that appliance */
+            for (itvsd = m->virtualSystemDescriptions.begin();
+                 itvsd != m->virtualSystemDescriptions.end();
+                 ++itvsd)
+            {
+                ComObjPtr<VirtualSystemDescription> vsdescThis = (*itvsd);
+                settings::MachineConfigFile *pConfig = vsdescThis->m->pConfig;
+                if(vsdescThis->m->pConfig!=NULL)
+                    stack.restoreOriginalUUIDOfAttachedDevice(pConfig);
+            }
+        }
     }
     writeLock.acquire();
@@ -1605 +1626 @@
 
     writeLock.release();
+
+    /* Create the import stack for the rollback on errors. */
+    ImportStack stack(pTask->locInfo, m->pReader->m_mapDisks, pTask->pProgress);
+
     try
     {
@@ -1685 +1710 @@
         pStorage->fCreateDigest = true;
 
-        /* Create the import stack for the rollback on errors. */
-        ImportStack stack(pTask->locInfo, m->pReader->m_mapDisks, pTask->pProgress);
         /*
          * Try to read the manifest file. First try.
@@ -1766 +1789 @@
     {
         rc = rc2;
+
+        /*
+         * Restoring original UUID from OVF description file.
+         * During import VB creates new UUIDs for imported images and 
+         * assigns them to the images. In case of failure we have to restore
+         * the original UUIDs because those new UUIDs are obsolete now and
+         * won't be used anymore.
+         */
+        {
+            list< ComObjPtr<VirtualSystemDescription> >::const_iterator itvsd;
+            /* Iterate through all virtual systems of that appliance */
+            for (itvsd = m->virtualSystemDescriptions.begin();
+                 itvsd != m->virtualSystemDescriptions.end();
+                 ++itvsd)
+            {
+                ComObjPtr<VirtualSystemDescription> vsdescThis = (*itvsd);
+                settings::MachineConfigFile *pConfig = vsdescThis->m->pConfig;
+                if(vsdescThis->m->pConfig!=NULL)
+                  stack.restoreOriginalUUIDOfAttachedDevice(pConfig);
+            }
+        }
     }
     writeLock.acquire();
@@ -3719 +3763 @@
                 vsdeTargetHD->strVboxCurrent = savedVboxCurrent;
 
-                d.uuid = hdId;
+                /*
+                 * 1. saving original UUID for restoring in case of failure. 
+                 * 2. replacement of original UUID by new UUID in the current VM config (settings::MachineConfigFile).
+                 */
+                {
+                    rc = stack.saveOriginalUUIDOfAttachedDevice(d, Utf8Str(hdId));
+                    d.uuid = hdId;
+                }
+
                 fFound = true;
                 break;
@@ -3894 +3946 @@
 }
 
+HRESULT Appliance::ImportStack::saveOriginalUUIDOfAttachedDevice(settings::AttachedDevice &device,
+                                                     const Utf8Str &newlyUuid)
+{
+    HRESULT rc = S_OK;
+
+    /* save for restoring */
+    mapNewUUIDsToOriginalUUIDs.insert(std::make_pair(newlyUuid, device.uuid.toString()));
+
+    return rc;
+}
+
+HRESULT Appliance::ImportStack::restoreOriginalUUIDOfAttachedDevice(settings::MachineConfigFile *config)
+{
+    HRESULT rc = S_OK;
+
+    settings::StorageControllersList &llControllers = config->storageMachine.llStorageControllers;
+    settings::StorageControllersList::iterator itscl;
+    for (itscl = llControllers.begin();
+         itscl != llControllers.end();
+         ++itscl)
+    {
+        settings::AttachedDevicesList &llAttachments = itscl->llAttachedDevices;
+        settings::AttachedDevicesList::iterator itadl = llAttachments.begin();
+        while (itadl != llAttachments.end())
+        {
+            std::map<Utf8Str , Utf8Str>::const_iterator cit =
+                mapNewUUIDsToOriginalUUIDs.find(itadl->uuid.toString());
+            if(cit!=mapNewUUIDsToOriginalUUIDs.end())
+            {
+                Utf8Str uuidOriginal = cit->second;
+                itadl->uuid = Guid(uuidOriginal);
+                mapNewUUIDsToOriginalUUIDs.erase(cit);
+            }
+            ++itadl;
+        }
+    }
+
+    return rc;
+}
+