Changeset 83190 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 3, 2020 12:25:47 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

136318

Message:

FE/Qt: bugref:9653: Extend UICloudMachine and UICloudNetworkingStuff with image name and size information as well.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICloudMachine.cpp (modified) (1 diff)
• UICloudMachine.h (modified) (3 diffs)
• UICloudNetworkingStuff.cpp (modified) (1 diff)
• UICloudNetworkingStuff.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudMachine.cpp ¶

@@ -84 +84 @@
     m_strBootingFirmware = fetchBootingFirmware(instanceInfoMap);
     m_strImageId = fetchImageId(instanceInfoMap);
+
+    /* Acquire image info sync way, be aware, this is blocking stuff, it takes some time: */
+    const QMap<QString, QString> imageInfoMap = getImageInfo(m_comCloudClient, m_strImageId);
+    //printf("Image info:\n");
+    //foreach (const QString &strKey, imageInfoMap.keys())
+    //    printf("key = %s, value = %s\n", strKey.toUtf8().constData(), imageInfoMap.value(strKey).toUtf8().constData());
+    //printf("\n");
+
+    /* Sorry, but these are hardcoded in Main: */
+    m_strImageName = imageInfoMap.value("display name");
+    m_strImageSize = imageInfoMap.value("size");
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudMachine.h ¶

@@ -81 +81 @@
     /** Returns cloud VM image id. */
     QString imageId() const { return m_strImageId; }
+    /** Returns cloud VM image name. */
+    QString imageName() const { return m_strImageName; }
+    /** Returns cloud VM image size. */
+    QString imageSize() const { return m_strImageSize; }
 
 private:
@@ -112 +116 @@
     /** Holds the cloud VM image id. */
     QString  m_strImageId;
+    /** Holds the cloud VM image name. */
+    QString  m_strImageName;
+    /** Holds the cloud VM image size. */
+    QString  m_strImageSize;
 };
 
@@ -168 +176 @@
     /** Returns cloud VM image id. */
     QString imageId() const { return d->imageId(); }
+    /** Returns cloud VM image name. */
+    QString imageName() const { return d->imageName(); }
+    /** Returns cloud VM image size. */
+    QString imageSize() const { return d->imageSize(); }
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.cpp ¶

@@ -184 +184 @@
 }
 
+QMap<QString, QString> UICloudNetworkingStuff::getImageInfo(const CCloudClient &comCloudClient,
+                                                            const QString &strId,
+                                                            QWidget *pParent /* = 0 */)
+{
+    /* Prepare result: */
+    QMap<QString, QString> resultMap;
+
+    /* Execute GetImageInfo async method: */
+    CStringArray comStringArray;
+    CProgress comProgress = comCloudClient.GetImageInfo(strId, comStringArray);
+    if (!comCloudClient.isOk())
+    {
+        if (pParent)
+            msgCenter().cannotAcquireCloudClientParameter(comCloudClient, pParent);
+        else
+        {
+            /// @todo fetch error info
+        }
+    }
+    else
+    {
+        /* Show "Acquire image info" progress: */
+        if (pParent)
+            msgCenter().showModalProgressDialog(comProgress,
+                                                UICommon::tr("Acquire cloud image info ..."),
+                                                ":/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
+        {
+            /* Append resulting list values we have, split them by pairs: */
+            foreach (const QString &strPair, comStringArray.GetValues())
+            {
+                const QList<QString> pair = strPair.split(" = ");
+                AssertReturn(pair.size() == 2, resultMap);
+                resultMap[pair.at(0)] = pair.at(1);
+            }
+        }
+    }
+
+    /* Return result: */
+    return resultMap;
+}
+
 QString UICloudNetworkingStuff::fetchOsType(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
 {

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.h ¶

@@ -58 +58 @@
                                                  QWidget *pParent = 0);
 
+    /** Acquires image info as a map.
+      * @param  comCloudClient  Brings cloud client object.
+      * @param  strId           Brings cloud image id.
+      * @param  pWidget         Brings parent widget to show messages according to,
+      *                         if no parent set, progress will be executed in blocking way. */
+    SHARED_LIBRARY_STUFF QMap<QString, QString> getImageInfo(const CCloudClient &comCloudClient,
+                                                             const QString &strId,
+                                                             QWidget *pParent = 0);
+
     /** Fetches cloud instance OS type from the passed @a info. */
     SHARED_LIBRARY_STUFF QString fetchOsType(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);