Changeset 79727 in vbox

Timestamp:

Jul 12, 2019 11:37:46 AM (6 years ago)

Author:

vboxsync

Message:

bugre:9481. OCICloudClient::getImageInfo(): removed the parameter "const std::vector<com::Utf8Str> &aParameters". It's not needed for now. OCICloudClient::importImage(): added the parameter "const com::Utf8Str &aUid" - OCI image id. It's better than pass the image id in the "const std::vector<com::Utf8Str> &aParameters".

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageCloud.cpp (modified) (11 diffs)
• Main/idl/VirtualBox.xidl (modified) (7 diffs)

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

@@ -138 +138 @@
     }
 
-    com::SafeArray<CloudMachineState_T> machimeStates;
+    com::SafeArray<CloudMachineState_T> machineStates;
     if (strState.isNotEmpty())
     {
         if (strState.equals("running"))
-            machimeStates.push_back(CloudMachineState_Running);
+            machineStates.push_back(CloudMachineState_Running);
         else if (strState.equals("paused"))
-            machimeStates.push_back(CloudMachineState_Stopped);
+            machineStates.push_back(CloudMachineState_Stopped);
         else if (strState.equals("terminated"))
-            machimeStates.push_back(CloudMachineState_Terminated);
+            machineStates.push_back(CloudMachineState_Terminated);
     }
 
@@ -204 +204 @@
 
     CHECK_ERROR2_RET(hrc, oCloudClient,
-                     ListInstances(ComSafeArrayAsInParam(machimeStates),
+                     ListInstances(ComSafeArrayAsInParam(machineStates),
                                    pVMNamesHolder.asOutParam(),
                                    pVMIdsHolder.asOutParam(),
@@ -284 +284 @@
         else if (strState.equals("deleted"))
             imageStates.push_back(CloudImageState_Deleted);
+        else if (strState.equals("exporting"))
+            imageStates.push_back(CloudImageState_Exporting);
+        else if (strState.equals("importing"))
+            imageStates.push_back(CloudImageState_Importing);
     }
 
@@ -878 +882 @@
         { "--bucket-name",    'b', RTGETOPT_REQ_STRING },
         { "--object-name",    'o', RTGETOPT_REQ_STRING },
-        { "--image-id",       'i', RTGETOPT_REQ_STRING }
+        { "--id",             'i', RTGETOPT_REQ_STRING }
     };
     RTGETOPTSTATE GetState;
@@ -982 +986 @@
     static const RTGETOPTDEF s_aOptions[] =
     {
-        { "--image-id",       'i', RTGETOPT_REQ_STRING },
+        { "--id",             'i', RTGETOPT_REQ_STRING },
         { "--bucket-name",    'b', RTGETOPT_REQ_STRING },
         { "--object-name",    'o', RTGETOPT_REQ_STRING }
@@ -1005 +1009 @@
             case 'i':
                 strImageId=ValueUnion.psz;
-                Bstr(Utf8Str("image-id=").append(ValueUnion.psz)).detachTo(parameters.appendedRaw());
                 break;
             case 'b':
@@ -1027 +1030 @@
 
     ComPtr<IVirtualBox> pVirtualBox = a->virtualBox;
-    Bstr bstrImageId;
     ComObjPtr<ICloudClient> oCloudClient;
     CHECK_ERROR2_RET(hrc, pCloudProfile,
@@ -1036 +1038 @@
     ComPtr<IProgress> progress;
     CHECK_ERROR2_RET(hrc, oCloudClient,
-                     ImportImage(pVirtualBox, ComSafeArrayAsInParam(parameters), progress.asOutParam()),
+                     ImportImage(Bstr(strImageId.c_str()).raw(), pVirtualBox, ComSafeArrayAsInParam(parameters), progress.asOutParam()),
                      RTEXITCODE_FAILURE);
     hrc = showProgress(progress);
@@ -1060 +1062 @@
     static const RTGETOPTDEF s_aOptions[] =
     {
-        { "--image-id", 'i', RTGETOPT_REQ_STRING }
+        { "--id", 'i', RTGETOPT_REQ_STRING }
     };
     RTGETOPTSTATE GetState;
@@ -1094 +1096 @@
     RTPrintf("Getting information about the cloud image with id \'%s\'...\n", strImageId.c_str());
 
-    com::SafeArray<BSTR> parameters;
     ComPtr<IStringArray> infoArray;
     com::SafeArray<BSTR> pStrInfoArray;
@@ -1102 +1103 @@
     CHECK_ERROR2_RET(hrc, oCloudClient,
                      GetImageInfo(Bstr(strImageId.c_str()).raw(),
-                                  ComSafeArrayAsInParam(parameters),
                                   infoArray.asOutParam(),
                                   pProgress.asOutParam()),

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

@@ -26066 +26066 @@
   <interface
     name="ICloudClient" extends="$unknown"
-    uuid="7ec55937-3152-4e06-8192-c3828aadc7ab"
+    uuid="949f8c85-c689-40fa-a6b2-14425ccdfc0d"
     wsmap="managed" reservedMethods="16" reservedAttributes="8"
     >
@@ -26266 +26266 @@
         Returns the information about an instance in the Cloud.
       </desc>
-      <param name="instanceId" type="wstring" dir="in">
-        <desc>What to search for. This is the instance ID.</desc>
+      <param name="uid" type="wstring" dir="in">
+        <desc>The id of instance in the Cloud.</desc>
       </param>
       <param name="description" type="IVirtualSystemDescription" dir="in">
@@ -26284 +26284 @@
       </desc>
       <param name="uid" type="wstring" dir="in">
-        <desc>the id of instance in the Cloud.</desc>
+        <desc>The id of instance in the Cloud.</desc>
       </param>
       <param name="progress" type="IProgress" dir="return">
@@ -26296 +26296 @@
       </desc>
       <param name="uid" type="wstring" dir="in">
-        <desc>the id of instance in the Cloud.</desc>
+        <desc>The id of instance in the Cloud.</desc>
       </param>
       <param name="progress" type="IProgress" dir="return">
@@ -26347 +26347 @@
     <method name="importImage">
       <desc>
-        Import an existing image in the Cloud into the VirtualBox.
-      </desc>
+        Import an existing image in the Cloud to the local host.
+      </desc>
+      <param name="uid" type="wstring" dir="in">
+        <desc>the id of image in the Cloud.</desc>
+      </param>
       <param name="virtualBox" type="IVirtualBox" dir="in">
         <desc>Reference to the server-side API root object.</desc>
@@ -26365 +26368 @@
       </desc>
       <param name="uid" type="wstring" dir="in">
-        <desc>the id of image in the Cloud.</desc>
+        <desc>The id of image in the Cloud.</desc>
       </param>
       <param name="progress" type="IProgress" dir="return">
@@ -26376 +26379 @@
         Returns the information about an image in the Cloud.
       </desc>
-      <param name="imageId" type="wstring" dir="in">
-        <desc>What to search for. This is the image ID.</desc>
-      </param>
-      <param name="parameters" type="wstring" dir="in" safearray="yes">
-        <desc>Each parameter in the array must be in the form "name=value".</desc>
+      <param name="uid" type="wstring" dir="in">
+        <desc>The id of image in the Cloud.</desc>
       </param>
       <param name="infoArray" type="IStringArray" dir="out">
-        <desc>Each parameter in the array must be in the form "name=value".</desc>
+        <desc>
+          An array where the image settings or properties is returned.
+          Each parameter in the array must be in the form "name=value".
+        </desc>
       </param>
       <param name="progress" type="IProgress" dir="return">