Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp (revision 75920) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp (revision 75921) @@ -152,5 +152,6 @@ /* For Cloud formats: */ if (field("isFormatCloudOne").toBool()) - return QString("%1://%2").arg(field("providerShortName").toString(), field("profileName").toString()); +// return QString("%1://%2").arg(field("providerShortName").toString(), field("profileName").toString()); + return QString("%1://%2").arg(field("providerShortName").toString(), field("path").toString()); else { Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (revision 75920) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (revision 75921) @@ -408,4 +408,12 @@ parameter.kind = ParameterKind_Array; } + else + if (strFieldName == "name") + { + AbstractVSDParameterString get; + get.value = parseJsonFieldString(strFieldName, field); + parameter.get = QVariant::fromValue(get); + parameter.kind = ParameterKind_String; + } } Index: /trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp (revision 75920) +++ /trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp (revision 75921) @@ -652,11 +652,4 @@ i_parseURI(aPath, m->locInfo); - /** @todo r=klaus all of this code should be made fully generic, applicable - * to any cloud provider. This implies changing the method names accordingly - * and (more importantly) moving all the cloud specific checking code to the - * actual ICloudClient implementation in the corresponding extpack. It will - * move the check to the async task, but that's a bearable cost, not getting - * the error straight from the API call but a tiny bit later through the - * Progress object. */ if (m->locInfo.storageType == VFSType_Cloud)//(isCloudDestination(aPath)) { @@ -799,35 +792,27 @@ { HRESULT rc; + + rc = i_setUpProgress(aProgress, + BstrFmt(tr("Export appliance '%s'"), aLocInfo.strPath.c_str()), + (aLocInfo.storageType == VFSType_File) ? WriteFile : WriteS3); + if (FAILED(rc)) + return rc; + + /* Initialize our worker task */ + TaskOVF* task = NULL; try { - rc = i_setUpProgress(aProgress, - BstrFmt(tr("Export appliance '%s'"), aLocInfo.strPath.c_str()), - (aLocInfo.storageType == VFSType_File) ? WriteFile : WriteS3); - if (FAILED(rc)) - return rc; - - /* Initialize our worker task */ - TaskOVF* task = NULL; - try - { - task = new TaskOVF(this, TaskOVF::Write, aLocInfo, aProgress); - } - catch(...) - { - throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, - tr("Could not create TaskOVF object for for writing out the OVF to disk")); - } - - /* The OVF version to write */ - task->enFormat = aFormat; - - rc = task->createThread(); - if (FAILED(rc)) throw rc; - - } - catch (HRESULT aRC) - { - rc = aRC; - } + task = new TaskOVF(this, TaskOVF::Write, aLocInfo, aProgress); + } + catch(...) + { + return setError(VBOX_E_OBJECT_NOT_FOUND, + tr("Could not create TaskOVF object for for writing out the OVF to disk")); + } + + /* The OVF version to write */ + task->enFormat = aFormat; + + rc = task->createThread(); return rc; @@ -838,145 +823,90 @@ { HRESULT rc; + + for (list >::const_iterator + it = m->virtualSystemDescriptions.begin(); + it != m->virtualSystemDescriptions.end(); + ++it) + { + ComObjPtr vsdescThis = *it; + std::list skipped = vsdescThis->i_findByType(VirtualSystemDescriptionType_CDROM); + std::list::const_iterator itSkipped = skipped.begin(); + while (itSkipped != skipped.end()) + { + (*itSkipped)->skipIt = true; + ++itSkipped; + } + + //remove all disks from the VirtualSystemDescription exept one + skipped = vsdescThis->i_findByType(VirtualSystemDescriptionType_HardDiskImage); + itSkipped = skipped.begin(); + + Utf8Str strBootLocation; + while (itSkipped != skipped.end()) + { + if (strBootLocation.isEmpty()) + strBootLocation = (*itSkipped)->strVBoxCurrent; + else + (*itSkipped)->skipIt = true; + ++itSkipped; + } + + //just in case + if (vsdescThis->i_findByType(VirtualSystemDescriptionType_HardDiskImage).empty()) + { + return setError(VBOX_E_OBJECT_NOT_FOUND, + tr("There are no images to export to Cloud after preparation steps")); + } + + /* + * Fills out the OCI settings + */ + std::list profileName = + vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCIProfileName); + if (profileName.size() > 1) + return setError(VBOX_E_OBJECT_NOT_FOUND, + tr("Cloud: More than one profile name was found.")); + else if (profileName.empty()) + return setError(VBOX_E_OBJECT_NOT_FOUND, + tr("Cloud: Profile name wasn't specified.")); + + if (profileName.front()->strVBoxCurrent.isEmpty()) + return setError(VBOX_E_OBJECT_NOT_FOUND, + tr("Cloud: Cloud user profile name is empty")); + + LogRel(("profile name: %s\n", profileName.front()->strVBoxCurrent.c_str())); + + } + + // we need to do that as otherwise Task won't be created successfully + aProgress.createObject(); + if (aLocInfo.strProvider.equals("OCI")) + { + aProgress->init(mVirtualBox, static_cast(this), + Bstr("Exporting VM to Cloud...").raw(), + TRUE /* aCancelable */, + 5, // ULONG cOperations, + 1000, // ULONG ulTotalOperationsWeight, + Bstr("Exporting VM to Cloud...").raw(), // aFirstOperationDescription + 10); // ULONG ulFirstOperationWeight + } + else + return setErrorVrc(VBOX_E_NOT_SUPPORTED, + tr("Only \"OCI\" cloud provider is supported for now. \"%s\" isn't supported."), + aLocInfo.strProvider); + // Initialize our worker task + TaskCloud* task = NULL; try { - /** @todo r=klaus all of this code should be made fully generic, - * doing only what is common for all cloud providers, i.e. pretty - * much nothing. The logic and data types need to be moved to the - * extension pack, anything else will not work. */ - - //remove all disks from the VirtualSystemDescription exept one - for (list >::const_iterator - it = m->virtualSystemDescriptions.begin(); - it != m->virtualSystemDescriptions.end(); - ++it) - { - ComObjPtr vsdescThis = *it; - std::list skipped = vsdescThis->i_findByType(VirtualSystemDescriptionType_CDROM); - std::list::const_iterator itSkipped = skipped.begin(); - while (itSkipped != skipped.end()) - { - (*itSkipped)->skipIt = true; - ++itSkipped; - } - - skipped = vsdescThis->i_findByType(VirtualSystemDescriptionType_HardDiskImage); - itSkipped = skipped.begin(); - - Utf8Str strBootLocation; - while (itSkipped != skipped.end()) - { - if (strBootLocation.isEmpty()) - strBootLocation = (*itSkipped)->strVBoxCurrent; - else - (*itSkipped)->skipIt = true; - ++itSkipped; - } - - //just in case - if (vsdescThis->i_findByType(VirtualSystemDescriptionType_HardDiskImage).empty()) - { - throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, - tr("There are no images to export to Cloud after preparation steps")); - } - - /* - * Fills out the OCI settings - */ - std::list machineName = - vsdescThis->i_findByType(VirtualSystemDescriptionType_Name); - if (machineName.empty()) - throw setError(VBOX_E_FILE_ERROR, tr("Cloud: VM name wasn't found")); - m->m_CloudExportData.strDisplayMachineName = machineName.front()->strVBoxCurrent; - LogRel(("Exported machine name: %s\n", m->m_CloudExportData.strDisplayMachineName.c_str())); - - m->m_CloudExportData.strBootImageName = strBootLocation; - LogRel(("Exported image: %s\n", m->m_CloudExportData.strBootImageName.c_str())); - - if (aLocInfo.strPath.isEmpty()) - throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, - tr("Cloud: Cloud user profile wasn't found")); - - m->m_CloudExportData.strProfileName = aLocInfo.strPath; - LogRel(("profile name: %s\n", m->m_CloudExportData.strProfileName.c_str())); - - Utf8Str strInstanceShapeId; - std::list shapeId = - vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCIInstanceShape); - if (shapeId.empty()) - throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, - tr("Cloud: Shape of instance wasn't found")); - - m->m_CloudExportData.strInstanceShapeId = shapeId.front()->strVBoxCurrent; - LogRel(("Shape: %s\n", m->m_CloudExportData.strInstanceShapeId.c_str())); - - std::list domainName = - vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCIDomain); - if (domainName.empty()) - throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, - tr("Cloud: Available domain wasn't found")); - - m->m_CloudExportData.strDomainName = domainName.front()->strVBoxCurrent; - LogRel(("Available domain name: %s\n", m->m_CloudExportData.strDomainName.c_str())); - - std::list bootDiskSize = - vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCIBootDiskSize); - if (bootDiskSize.empty()) - throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, - tr("Cloud: Boot disk size wasn't found")); - - m->m_CloudExportData.strBootDiskSize = bootDiskSize.front()->strVBoxCurrent; - LogRel(("Boot disk size: %s\n", m->m_CloudExportData.strBootDiskSize.c_str())); - - std::list bucketId = - vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCIBucket); - if (bucketId.empty()) - throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, - tr("Cloud: Bucket wasn't found")); - - m->m_CloudExportData.strBucketId = bucketId.front()->strVBoxCurrent; - LogRel(("bucket name: %s\n", m->m_CloudExportData.strBucketId.c_str())); - - std::list subnet = - vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCISubnet); - if (subnet.empty()) - throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, - tr("Cloud: Subnet wasn't found")); - - m->m_CloudExportData.strSubnet = subnet.front()->strVBoxCurrent; - LogRel(("Subnet name: %s\n", m->m_CloudExportData.strSubnet.c_str())); - - std::list publicIP = - vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCIPublicIP); - if (publicIP.empty()) - throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, - tr("Cloud: Public IP setting wasn't found")); - - m->m_CloudExportData.fPublicIP = (publicIP.front()->strVBoxCurrent == "true") ? true : false; - LogRel(("public IP: %s\n", m->m_CloudExportData.fPublicIP ? "yes" : "no")); - } - - // we need to do that as otherwise Task won't be created successfully - aProgress.createObject(); - - // Initialize our worker task - TaskCloud* task = NULL; - try - { - task = new Appliance::TaskCloud(this, TaskCloud::Export, aLocInfo, aProgress); - } - catch(...) - { - throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, - tr("Could not create TaskCloud object for exporting to Cloud")); - } - - rc = task->createThread(); - if (FAILED(rc)) throw rc; - - } - catch (HRESULT aRC) - { - rc = aRC; - } + task = new Appliance::TaskCloud(this, TaskCloud::Export, aLocInfo, aProgress); + + } + catch(...) + { + return setError(VBOX_E_OBJECT_NOT_FOUND, + tr("Could not create TaskCloud object for exporting to Cloud")); + } + + rc = task->createThread(); return rc; @@ -987,32 +917,24 @@ HRESULT rc; RT_NOREF(aFormat); + + rc = i_setUpProgress(aProgress, + BstrFmt(tr("Export appliance '%s'"), aLocInfo.strPath.c_str()), + (aLocInfo.storageType == VFSType_File) ? WriteFile : WriteS3); + if (FAILED(rc)) + return rc; + + /* Initialize our worker task */ + TaskOPC* task = NULL; try { - rc = i_setUpProgress(aProgress, - BstrFmt(tr("Export appliance '%s'"), aLocInfo.strPath.c_str()), - (aLocInfo.storageType == VFSType_File) ? WriteFile : WriteS3); - if (FAILED(rc)) - return rc; - - /* Initialize our worker task */ - TaskOPC* task = NULL; - try - { - task = new Appliance::TaskOPC(this, TaskOPC::Export, aLocInfo, aProgress); - } - catch(...) - { - throw rc = setError(VBOX_E_OBJECT_NOT_FOUND, - tr("Could not create TaskOPC object for for writing out the OPC to disk")); - } - - rc = task->createThread(); - if (FAILED(rc)) throw rc; - - } - catch (HRESULT aRC) - { - rc = aRC; - } + task = new Appliance::TaskOPC(this, TaskOPC::Export, aLocInfo, aProgress); + } + catch(...) + { + return setError(VBOX_E_OBJECT_NOT_FOUND, + tr("Could not create TaskOPC object for for writing out the OPC to disk")); + } + + rc = task->createThread(); return rc; @@ -2326,32 +2248,54 @@ ComPtr cpm; hrc = mVirtualBox->COMGETTER(CloudProviderManager)(cpm.asOutParam()); - Utf8Str strProviderName("OCI"); + if (FAILED(hrc)) + return setErrorVrc(VERR_COM_OBJECT_NOT_FOUND, tr("Cloud: Cloud provider manager object wasn't found")); + + Utf8Str strProviderName = pTask->locInfo.strProvider; ComPtr cloudProvider; + ComPtr cloudProfile; hrc = cpm->GetProviderByShortName(Bstr(strProviderName.c_str()).raw(), cloudProvider.asOutParam()); - ComPtr cloudProfile; - hrc = cloudProvider->GetProfileByName(Bstr(m->m_CloudExportData.strProfileName.c_str()).raw(), cloudProfile.asOutParam()); + + if (FAILED(hrc)) + return setErrorVrc(VERR_COM_OBJECT_NOT_FOUND, tr("Cloud: Cloud provider object wasn't found")); + + ComPtr vsd = m->virtualSystemDescriptions.front(); + + com::SafeArray retTypes; + com::SafeArray aRefs; + com::SafeArray aOvfValues; + com::SafeArray aVBoxValues; + com::SafeArray aExtraConfigValues; + + hrc = vsd->GetDescriptionByType(VirtualSystemDescriptionType_CloudOCIProfileName, + ComSafeArrayAsOutParam(retTypes), + ComSafeArrayAsOutParam(aRefs), + ComSafeArrayAsOutParam(aOvfValues), + ComSafeArrayAsOutParam(aVBoxValues), + ComSafeArrayAsOutParam(aExtraConfigValues)); + if (FAILED(hrc)) + return hrc; + + Utf8Str profileName(aVBoxValues[0]); + if (profileName.isEmpty()) + return setErrorVrc(VBOX_E_OBJECT_NOT_FOUND, tr("Cloud: Cloud user profile name wasn't found")); + + hrc = cloudProvider->GetProfileByName(aVBoxValues[0], cloudProfile.asOutParam()); + if (FAILED(hrc)) + return setErrorVrc(VERR_COM_OBJECT_NOT_FOUND, tr("Cloud: Cloud profile object wasn't found")); + ComObjPtr cloudClient; hrc = cloudProfile->CreateCloudClient(cloudClient.asOutParam()); - - if (SUCCEEDED(hrc)) - { - LogRel(("Appliance::i_writeFSCloud(): calling CloudClient::ExportLaunchVM\n")); - - if (m->virtualSystemDescriptions.size() == 1) { - ComPtr VBox(mVirtualBox); - - pTask->pProgress->init(mVirtualBox, static_cast(this), - Bstr("Exporting VM to Cloud...").raw(), - TRUE /* aCancelable */, - 5, // ULONG cOperations, - 1000, // ULONG ulTotalOperationsWeight, - Bstr("Exporting VM to Cloud...").raw(), // aFirstOperationDescription - 10); // ULONG ulFirstOperationWeight, - - hrc = cloudClient->ExportLaunchVM(m->virtualSystemDescriptions.front(), pTask->pProgress, VBox); - } else { - /// @todo Fail here with user notification. We do export 1 VM only - } - } + if (FAILED(hrc)) + return setErrorVrc(VERR_COM_OBJECT_NOT_FOUND, tr("Cloud: Cloud client object wasn't found")); + + LogRel(("Appliance::i_writeFSCloud(): calling CloudClient::ExportLaunchVM\n")); + + if (m->virtualSystemDescriptions.size() == 1) + { + ComPtr VBox(mVirtualBox); + hrc = cloudClient->ExportLaunchVM(m->virtualSystemDescriptions.front(), pTask->pProgress, VBox); + } + else + hrc = setErrorVrc(VERR_MISMATCH, tr("Export to Cloud isn't supported for more than one VM instance.")); LogFlowFuncLeave();