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

Timestamp:

Feb 26, 2020 12:40:06 PM (5 years ago)

Author:

vboxsync

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

136281

Message:

FE/Qt: bugref:9653: Extend UICloudMachine and UICloudNetworkingStuff to generate actual General and System details.

Location:

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

Files:

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

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

@@ -16 +16 @@
  */
 
+/* Qt includes: */
+#include <QMap>
+
 /* GUI includes: */
 #include "UICloudMachine.h"
+#include "UICloudNetworkingStuff.h"
 
 
@@ -30 +34 @@
     , m_strId(strId)
     , m_strName(strName)
+    , m_fDataActual(false)
     , m_fAccessible(true)
     , m_strOsType("Other")
@@ -43 +48 @@
     , m_strId(other.m_strId)
     , m_strName(other.m_strName)
+    , m_fDataActual(other.m_fDataActual)
     , m_fAccessible(other.m_fAccessible)
     , m_strOsType(other.m_strOsType)
@@ -78 +84 @@
 QString UICloudMachineData::osType()
 {
+    if (!m_fDataActual)
+        refresh();
     return m_strOsType;
 }
@@ -83 +91 @@
 int UICloudMachineData::memorySize()
 {
+    if (!m_fDataActual)
+        refresh();
     return m_iMemorySize;
 }
@@ -88 +98 @@
 int UICloudMachineData::cpuCount()
 {
+    if (!m_fDataActual)
+        refresh();
     return m_iCpuCount;
+}
+
+void UICloudMachineData::refresh()
+{
+    /* Acquire instance info sync way, be aware, this is blocking stuff, it takes some time: */
+    const QMap<KVirtualSystemDescriptionType, QString> infoMap = getInstanceInfo(m_comCloudClient, m_strId);
+
+    /* Refresh corresponding values: */
+    m_strOsType = fetchOsType(infoMap);
+    m_iMemorySize = fetchMemorySize(infoMap);
+    m_iCpuCount = fetchCpuCount(infoMap);
+
+    /* Mark data actual: */
+    m_fDataActual = true;
 }
 

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

@@ -70 +70 @@
 private:
 
+    /** Performs data refreshing. */
+    void refresh();
+
     /** Holds the cloud client object reference. */
     CCloudClient  m_comCloudClient;
@@ -77 +80 @@
     /** Holds the cloud VM name. */
     const QString  m_strName;
+
+    /** Holds whether data is actual. */
+    bool  m_fDataActual;
 
     /** Holds whether cloud VM is accessible. */

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

@@ -196 +196 @@
 }
 
+int UICloudNetworkingStuff::fetchMemorySize(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
+{
+    /* Return memory size value: */
+    return infoMap.value(KVirtualSystemDescriptionType_Memory).toInt();
+}
+
+int UICloudNetworkingStuff::fetchCpuCount(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
+{
+    /* Return CPU count value: */
+    return infoMap.value(KVirtualSystemDescriptionType_CPU).toInt();
+}
+
 KMachineState UICloudNetworkingStuff::fetchMachineState(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
 {

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

@@ -60 +60 @@
     /** Fetches cloud VM OS type from the passed @a info. */
     SHARED_LIBRARY_STUFF QString fetchOsType(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
+    /** Fetches cloud VM memory size from the passed @a info. */
+    SHARED_LIBRARY_STUFF int fetchMemorySize(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
+    /** Fetches cloud VM CPU count from the passed @a info. */
+    SHARED_LIBRARY_STUFF int fetchCpuCount(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
     /** Fetches cloud VM state from the passed @a info. */
     SHARED_LIBRARY_STUFF KMachineState fetchMachineState(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);