Changeset 78841 in vbox

Timestamp:

May 29, 2019 11:24:39 AM (6 years ago)

Author:

vboxsync

Message:

bugref:9436. Added progress for getInstanceInfo. Now getInstanceInfo is run in async way.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageAppliance.cpp (modified) (3 diffs)
• Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/src-server/ApplianceImplImport.cpp (modified) (1 diff)

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

@@ -149 +149 @@
     { "--cloud",                'j', RTGETOPT_REQ_NOTHING},
     { "--cloudprofile",         'k', RTGETOPT_REQ_STRING },
-    { "--cloudinstanceid",      'l', RTGETOPT_REQ_STRING }
+    { "--cloudinstanceid",      'l', RTGETOPT_REQ_STRING },
+    { "--cloudbucket",          'B', RTGETOPT_REQ_STRING }
 };
 
@@ -328 +329 @@
                                        GetState.pDef->pszLong);
                 mapArgsMapsPerVsys[ulCurVsys]["cloudinstanceid"] = ValueUnion.psz;
+                break;
+
+            case 'B':   // --cloudbucket
+                if (actionType != CLOUD)
+                    return errorSyntax(USAGE_EXPORTAPPLIANCE, "Option \"%s\" requires preceding --cloud argument.",
+                                       GetState.pDef->pszLong);
+                mapArgsMapsPerVsys[ulCurVsys]["cloudbucket"] = ValueUnion.psz;
                 break;
 
@@ -978 +986 @@
 
                         case VirtualSystemDescriptionType_CloudInstanceShape:
+                            RTPrintf("%2u: Suggested cloud shape \"%ls\"\n",
+                                    a, bstrFinalValue.raw(), i);
+                            break;
+
+                        case VirtualSystemDescriptionType_CloudBucket:
+                            if (findArgValue(strOverride, pmapArgs, "cloudbucket"))
+                            {
+                                bstrFinalValue = strOverride;
+                                RTPrintf("%2u: Cloud bucket id specified with --cloudbucket: \"%ls\"\n",
+                                        a, bstrFinalValue.raw());
+                            }
+                            else
+                                RTPrintf("%2u: Suggested cloud bucket id \"%ls\""
+                                        "\n    (change with \"--cloud %u --cloudbucket <id>\")\n",
+                                        a, bstrFinalValue.raw(), i);
+                            break;
+
+                        case VirtualSystemDescriptionType_CloudProfileName:
+                            if (findArgValue(strOverride, pmapArgs, "cloudprofile"))
+                            {
+                                bstrFinalValue = strOverride;
+                                RTPrintf("%2u: Cloud profile name specified with --cloudprofile: \"%ls\"\n",
+                                        a, bstrFinalValue.raw());
+                            }
+                            else
+                                RTPrintf("%2u: Suggested cloud profile name \"%ls\""
+                                        "\n    (change with \"--cloud %u --cloudprofile <id>\")\n",
+                                        a, bstrFinalValue.raw(), i);
+                            break;
+
+                        case VirtualSystemDescriptionType_CloudInstanceId:
+                            if (findArgValue(strOverride, pmapArgs, "cloudinstanceid"))
+                            {
+                                bstrFinalValue = strOverride;
+                                RTPrintf("%2u: Cloud instance id specified with --cloudinstanceid: \"%ls\"\n",
+                                        a, bstrFinalValue.raw());
+                            }
+                            else
+                                RTPrintf("%2u: Suggested cloud instance id \"%ls\""
+                                        "\n    (change with \"--cloud %u --cloudinstanceid <id>\")\n",
+                                        a, bstrFinalValue.raw(), i);
+                            break;
+
+                        case VirtualSystemDescriptionType_CloudImageId:
+                            RTPrintf("%2u: Suggested cloud base image id \"%ls\"\n",
+                                    a, bstrFinalValue.raw(), i);
+                            break;
                         case VirtualSystemDescriptionType_CloudDomain:
                         case VirtualSystemDescriptionType_CloudBootDiskSize:
-                        case VirtualSystemDescriptionType_CloudBucket:
                         case VirtualSystemDescriptionType_CloudOCIVCN:
                         case VirtualSystemDescriptionType_CloudPublicIP:
-                        case VirtualSystemDescriptionType_CloudProfileName:
                         case VirtualSystemDescriptionType_CloudOCISubnet:
                         case VirtualSystemDescriptionType_CloudKeepObject:
                         case VirtualSystemDescriptionType_CloudLaunchInstance:
-                        case VirtualSystemDescriptionType_CloudInstanceId:
-                        case VirtualSystemDescriptionType_CloudImageId:
                         case VirtualSystemDescriptionType_CloudInstanceState:
                         case VirtualSystemDescriptionType_CloudImageState:

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

@@ -502 +502 @@
     CHECK_ERROR2_RET(hrc, pAppliance, COMGETTER(VirtualSystemDescriptions)(ComSafeArrayAsOutParam(vsdArray)), RTEXITCODE_FAILURE);
     ComPtr<IVirtualSystemDescription> instanceDescription = vsdArray[0];
+
+    ComPtr<IProgress> progress;
     CHECK_ERROR2_RET(hrc, oCloudClient,
-                     GetInstanceInfo(Bstr(strInstanceId.c_str()).raw(), instanceDescription),
-                     RTEXITCODE_FAILURE);
+                     GetInstanceInfo(Bstr(strInstanceId.c_str()).raw(), instanceDescription, progress.asOutParam()),
+                     RTEXITCODE_FAILURE);
+
+    hrc = showProgress(progress);
+    CHECK_PROGRESS_ERROR_RET(progress, ("Getting information about cloud instance failed"), RTEXITCODE_FAILURE);
+
     RTPrintf("Cloud instance info (provider '%s'):\n",
              pCommonOpts->provider.pszProviderName);

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

@@ -26006 +26006 @@
         <desc>VirtualSystemDescription object which is describing a machine</desc>
       </param>
+      <param name="progress" type="IProgress" dir="return">
+        <desc>
+          Progress object to track the operation completion.
+        </desc>
+      </param>
     </method>
 

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

@@ -1237 +1237 @@
 
         LogRel(("%s: calling CloudClient::GetInstanceInfo()\n", __FUNCTION__));
-        hrc = cloudClient->GetInstanceInfo(Bstr(parts.at(1)).raw(), instanceDescription);//instance id
+
+        ComPtr<IProgress> pProgress;
+        hrc = cloudClient->GetInstanceInfo(Bstr(parts.at(1)).raw(), instanceDescription, pProgress.asOutParam());
+        if (FAILED(hrc)) throw hrc;
+        hrc = pTask->pProgress->WaitForOtherProgressCompletion(pProgress, 60000);//timeout 1 min = 60000 millisec
         if (FAILED(hrc)) throw hrc;