Changeset 83111 in vbox for trunk

Timestamp:

Feb 18, 2020 4:09:49 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Moving listInstances functionality from UITaskCloudAcquireInstances to UICloudNetworkingStuff to make it possible to reuse it; Besides that, extending it with possibility to be executed in sync/async way on demand.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager

Files:

• UICloudNetworkingStuff.cpp (modified) (2 diffs)
• UICloudNetworkingStuff.h (modified) (1 diff)
• UITaskCloudAcquireInstances.cpp (modified) (2 diffs)
• UITaskCloudAcquireInstances.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UICloudNetworkingStuff.cpp

@@ -23 +23 @@
 /* COM includes: */
 #include "CAppliance.h"
+#include "CProgress.h"
+#include "CStringArray.h"
 #include "CVirtualBox.h"
 #include "CVirtualSystemDescription.h"
 
+
+QList<UICloudMachine> UICloudNetworkingStuff::listInstances(const CCloudClient &comCloudClient,
+                                                            QWidget *pParent /* = 0 */)
+{
+    /* Prepare VM names, ids and states.
+     * Currently we are interested in Running and Stopped VMs only. */
+    CStringArray comNames;
+    CStringArray comIDs;
+    const QVector<KCloudMachineState> cloudMachineStates  = QVector<KCloudMachineState>()
+                                                         << KCloudMachineState_Running
+                                                         << KCloudMachineState_Stopped;
+
+    /* Now execute ListInstances async method: */
+    CProgress comProgress = comCloudClient.ListInstances(cloudMachineStates, comNames, comIDs);
+    if (!comCloudClient.isOk())
+    {
+        if (pParent)
+            msgCenter().cannotAcquireCloudClientParameter(comCloudClient, pParent);
+        else
+        {
+            /// @todo fetch error info
+        }
+    }
+    else
+    {
+        /* Show "Acquire cloud instances" progress: */
+        if (pParent)
+            msgCenter().showModalProgressDialog(comProgress,
+                                                UICommon::tr("Acquire cloud instances ..."),
+                                                ":/progress_reading_appliance_90px.png", pParent, 0);
+        else
+            comProgress.WaitForCompletion(-1);
+        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+        {
+            if (pParent)
+                msgCenter().cannotAcquireCloudClientParameter(comProgress, pParent);
+            else
+            {
+                /// @todo fetch error info
+            }
+        }
+        else
+        {
+            /* Fetch acquired objects to lists: */
+            const QVector<QString> instanceIds = comIDs.GetValues();
+            const QVector<QString> instanceNames = comNames.GetValues();
+            QList<UICloudMachine> resultList;
+            for (int i = 0; i < instanceIds.size(); ++i)
+                resultList << UICloudMachine(comCloudClient, instanceIds.at(i), instanceNames.at(i));
+            return resultList;
+        }
+    }
+
+    /* Return empty list by default: */
+    return QList<UICloudMachine>();
+}
 
 QString UICloudNetworkingStuff::getInstanceInfo(KVirtualSystemDescriptionType enmType,
@@ -81 +139 @@
                 /* Show "Acquire instance info" progress: */
                 if (pParent)
-                    msgCenter().showModalProgressDialog(comProgress, UICommon::tr("Acquire instance info ..."),
+                    msgCenter().showModalProgressDialog(comProgress,
+                                                        UICommon::tr("Acquire cloud instance info ..."),
                                                         ":/progress_reading_appliance_90px.png", pParent, 0);
                 else

trunk/src/VBox/Frontends/VirtualBox/src/manager/UICloudNetworkingStuff.h

@@ -22 +22 @@
 #endif
 
+/* GUI includes: */
+#include "UICloudMachine.h"
+
 /* COM includes: */
 #include "COMEnums.h"
 #include "CCloudClient.h"
 
-/* Forward declarations: */
-class QString;
-class QWidget;
-
 /** Cloud networking stuff namespace. */
 namespace UICloudNetworkingStuff
 {
+    /** Acquires instance list.
+      * @param  comCloudClient  Brings cloud client object.
+      * @param  pWidget         Brings parent widget to show messages according to,
+      *                         if no parent set, progress will be executed in blocking way. */
+    QList<UICloudMachine> listInstances(const CCloudClient &comCloudClient,
+                                        QWidget *pParent = 0);
+
     /** Acquires instance info of certain @a enmType.
       * @param  comCloudClient  Brings cloud client object.
       * @param  strId           Brings cloud VM id.
-      * @param  pWidget         Brings parent widget to show messages according to. */
+      * @param  pWidget         Brings parent widget to show messages according to,
+      *                         if no parent set, progress will be executed in blocking way. */
     QString getInstanceInfo(KVirtualSystemDescriptionType enmType,
                             const CCloudClient &comCloudClient,

trunk/src/VBox/Frontends/VirtualBox/src/manager/UITaskCloudAcquireInstances.cpp

@@ -17 +17 @@
 
 /* GUI includes: */
+#include "UICloudNetworkingStuff.h"
 #include "UITaskCloudAcquireInstances.h"
-
-/* COM includes: */
-#include "CProgress.h"
-#include "CStringArray.h"
 
 
@@ -50 +47 @@
 {
     m_mutex.lock();
-
-    /* Gather VM names, ids and states.
-     * Currently we are interested in Running and Stopped VMs only. */
-    CStringArray comNames;
-    CStringArray comIDs;
-    const QVector<KCloudMachineState> cloudMachineStates  = QVector<KCloudMachineState>()
-                                                         << KCloudMachineState_Running
-                                                         << KCloudMachineState_Stopped;
-
-    /* Ask for cloud instance list: */
-    CProgress comProgress = m_comCloudClient.ListInstances(cloudMachineStates, comNames, comIDs);
-    if (!m_comCloudClient.isOk())
-    {
-        /// @todo pack error info to m_comErrorInfo
-    }
-    else
-    {
-        /* Wait for "Acquire cloud instances" progress: */
-        comProgress.WaitForCompletion(-1);
-        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-        {
-            /// @todo pack error info to m_comErrorInfo
-        }
-        else
-        {
-            /* Fetch acquired objects to lists: */
-            const QVector<QString> instanceIds = comIDs.GetValues();
-            const QVector<QString> instanceNames = comNames.GetValues();
-            for (int i = 0; i < instanceIds.size(); ++i)
-                m_result << UICloudMachine(m_comCloudClient, instanceIds.at(i), instanceNames.at(i));
-        }
-    }
-
+    m_result = listInstances(m_comCloudClient);
     m_mutex.unlock();
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UITaskCloudAcquireInstances.h

@@ -44 +44 @@
 public:
 
-    /** Constructs update task taking @a comCloudClient and @a pParentNode as data. */
+    /** Constructs update task taking @a comCloudClient and @a pParentNode as data.
+      * @param  comCloudClient  Brings the cloud client object.
+      * @param  m_pParentNode   Brings the parent node reference. */
     UITaskCloudAcquireInstances(const CCloudClient &comCloudClient, UIChooserNode *pParentNode);