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

Timestamp:

Mar 2, 2020 9:55:12 AM (5 years ago)

Author:

vboxsync

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

136308

Message:

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

Location:

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

Files:

• UICloudMachine.cpp (modified) (3 diffs)
• UICloudMachine.h (modified) (3 diffs)
• UICloudNetworkingStuff.cpp (modified) (2 diffs)
• UICloudNetworkingStuff.h (modified) (3 diffs)

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

@@ -42 +42 @@
     //, m_strDomain("None")
     //, m_strBootingFirmware("None")
+    //, m_strImageId(QString())
 {
     //printf("Data for machine with id = {%s} is created\n", m_strId.toUtf8().constData());
@@ -59 +60 @@
     , m_strDomain(other.m_strDomain)
     , m_strBootingFirmware(other.m_strBootingFirmware)
+    , m_strImageId(other.m_strImageId)
 {
     //printf("Data for machine with id = {%s} is copied\n", m_strId.toUtf8().constData());
@@ -71 +73 @@
 {
     /* 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);
+    const QMap<KVirtualSystemDescriptionType, QString> instanceInfoMap = getInstanceInfo(m_comCloudClient, m_strId);
 
     /* Refresh corresponding values: */
-    m_strOsType = fetchOsType(infoMap);
-    m_iMemorySize = fetchMemorySize(infoMap);
-    m_iCpuCount = fetchCpuCount(infoMap);
-    m_enmMachineState = fetchMachineState(infoMap);
-    m_strInstanceShape = fetchInstanceShape(infoMap);
-    m_strDomain = fetchDomain(infoMap);
-    m_strBootingFirmware = fetchBootingFirmware(infoMap);
+    m_strOsType = fetchOsType(instanceInfoMap);
+    m_iMemorySize = fetchMemorySize(instanceInfoMap);
+    m_iCpuCount = fetchCpuCount(instanceInfoMap);
+    m_enmMachineState = fetchMachineState(instanceInfoMap);
+    m_strInstanceShape = fetchShape(instanceInfoMap);
+    m_strDomain = fetchDomain(instanceInfoMap);
+    m_strBootingFirmware = fetchBootingFirmware(instanceInfoMap);
+    m_strImageId = fetchImageId(instanceInfoMap);
 }
 

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

@@ -79 +79 @@
     /** Returns cloud VM booting firmware. */
     QString bootingFirmware() const { return m_strBootingFirmware; }
+    /** Returns cloud VM image id. */
+    QString imageId() const { return m_strImageId; }
 
 private:
@@ -108 +110 @@
     /** Holds the cloud VM booting firmware. */
     QString  m_strBootingFirmware;
+    /** Holds the cloud VM image id. */
+    QString  m_strImageId;
 };
 
@@ -162 +166 @@
     /** Returns cloud VM booting firmware. */
     QString bootingFirmware() const { return d->bootingFirmware(); }
+    /** Returns cloud VM image id. */
+    QString imageId() const { return d->imageId(); }
 
 private:

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

@@ -208 +208 @@
 }
 
-QString UICloudNetworkingStuff::fetchInstanceShape(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
+QString UICloudNetworkingStuff::fetchShape(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
 {
     /* Return instance shape value: */
@@ -238 +238 @@
     return infoMap.value(KVirtualSystemDescriptionType_BootingFirmware);
 }
+
+QString UICloudNetworkingStuff::fetchImageId(const QMap<KVirtualSystemDescriptionType, QString> &infoMap)
+{
+    /* Return image id value: */
+    return infoMap.value(KVirtualSystemDescriptionType_CloudImageId);
+}

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

@@ -42 +42 @@
     /** Acquires instance info as a map.
       * @param  comCloudClient  Brings cloud client object.
-      * @param  strId           Brings cloud VM id.
+      * @param  strId           Brings cloud instance id.
       * @param  pWidget         Brings parent widget to show messages according to,
       *                         if no parent set, progress will be executed in blocking way. */
@@ -50 +50 @@
     /** Acquires instance info of certain @a enmType as a string.
       * @param  comCloudClient  Brings cloud client object.
-      * @param  strId           Brings cloud VM id.
+      * @param  strId           Brings cloud instance id.
       * @param  pWidget         Brings parent widget to show messages according to,
       *                         if no parent set, progress will be executed in blocking way. */
@@ -58 +58 @@
                                                  QWidget *pParent = 0);
 
-    /** Fetches cloud VM OS type from the passed @a info. */
+    /** Fetches cloud instance 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. */
+    /** Fetches cloud instance 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. */
+    /** Fetches cloud instance CPU count from the passed @a info. */
     SHARED_LIBRARY_STUFF int fetchCpuCount(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
-    /** Fetches cloud VM instance shape from the passed @a info. */
-    SHARED_LIBRARY_STUFF QString fetchInstanceShape(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
-    /** Fetches cloud VM domain from the passed @a info. */
+    /** Fetches cloud instance shape from the passed @a info. */
+    SHARED_LIBRARY_STUFF QString fetchShape(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
+    /** Fetches cloud instance domain from the passed @a info. */
     SHARED_LIBRARY_STUFF QString fetchDomain(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
-    /** Fetches cloud VM state from the passed @a info. */
+    /** Fetches cloud instance state from the passed @a info. */
     SHARED_LIBRARY_STUFF KMachineState fetchMachineState(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
-    /** Fetches cloud VM booting firmware from the passed @a info. */
+    /** Fetches cloud instance booting firmware from the passed @a info. */
     SHARED_LIBRARY_STUFF QString fetchBootingFirmware(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
+    /** Fetches cloud instance image id from the passed @a info. */
+    SHARED_LIBRARY_STUFF QString fetchImageId(const QMap<KVirtualSystemDescriptionType, QString> &infoMap);
 }