Changeset 73716 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 16, 2018 3:58:57 PM (6 years ago)

Author:

vboxsync

Message:

Main/CloudProviderManager+CloudProvider+CloudProfile: Introduce CloudProfile as separate interface, and do a big cleanup. Adding synchronization and incomplete support for moving to an extension pack. Updated VBoxManage to list providers and touched up the GUI code slightly to deal with the changed interfaces.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageDisk.cpp (modified) (1 diff)
• VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManage/VBoxManageList.cpp (modified) (5 diffs)
• VirtualBox/src/converter/UIConverterBackend.h (modified) (2 diffs)
• VirtualBox/src/converter/UIConverterBackendCOM.cpp (modified) (2 diffs)
• VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (modified) (9 diffs)
• VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h (modified) (4 diffs)
• VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (modified) (2 diffs)
• VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h (modified) (1 diff)

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

@@ -1380 +1380 @@
                          fFirst ? "Property:       " : "                ",
                          names[i], value.raw());
+                fFirst = false;
             }
         }

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

@@ -449 +449 @@
                      "                            hostinfo|hostcpuids|hddbackends|hdds|dvds|floppies|\n"
                      "                            usbhost|usbfilters|systemproperties|extpacks|\n"
-                     "                            groups|webcams|screenshotformats\n"
+                     "                            groups|webcams|screenshotformats|cloudproviders|\n"
+                     "                            cloudprofiles\n"
                      "\n", SEP);
 

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

@@ -900 +900 @@
 }
 
+/**
+ * List available cloud providers.
+ *
+ * @returns See produceList.
+ * @param   pVirtualBox         Reference to the IVirtualBox pointer.
+ */
+static HRESULT listCloudProviders(const ComPtr<IVirtualBox> pVirtualBox)
+{
+    HRESULT rc = S_OK;
+    ComPtr<ICloudProviderManager> pCloudProviderManager;
+    CHECK_ERROR(pVirtualBox, COMGETTER(CloudProviderManager)(pCloudProviderManager.asOutParam()));
+    com::SafeIfaceArray<ICloudProvider> apCloudProviders;
+    CHECK_ERROR(pCloudProviderManager, COMGETTER(Providers)(ComSafeArrayAsOutParam(apCloudProviders)));
+
+    RTPrintf("Supported %d cloud providers:\n", apCloudProviders.size());
+    for (size_t i = 0; i < apCloudProviders.size(); ++i)
+    {
+        ComPtr<ICloudProvider> pCloudProvider = apCloudProviders[i];
+        Bstr bstrProviderName;
+        pCloudProvider->COMGETTER(Name)(bstrProviderName.asOutParam());
+        RTPrintf("Name:            %ls\n", bstrProviderName.raw());
+        pCloudProvider->COMGETTER(ShortName)(bstrProviderName.asOutParam());
+        RTPrintf("Short Name:      %ls\n", bstrProviderName.raw());
+        Bstr bstrProviderID;
+        pCloudProvider->COMGETTER(Id)(bstrProviderID.asOutParam());
+        RTPrintf("GUID:            %ls\n", bstrProviderID.raw());
+
+        RTPrintf("\n");
+    }
+    return rc;
+}
+
+
+/**
+ * List all available cloud profiles (by iterating over the cloud providers).
+ *
+ * @returns See produceList.
+ * @param   pVirtualBox         Reference to the IVirtualBox pointer.
+ * @param   fOptLong            If true, list all profile properties.
+ */
+static HRESULT listCloudProfiles(const ComPtr<IVirtualBox> pVirtualBox, bool fOptLong)
+{
+    HRESULT rc = S_OK;
+    ComPtr<ICloudProviderManager> pCloudProviderManager;
+    CHECK_ERROR(pVirtualBox, COMGETTER(CloudProviderManager)(pCloudProviderManager.asOutParam()));
+    com::SafeIfaceArray<ICloudProvider> apCloudProviders;
+    CHECK_ERROR(pCloudProviderManager, COMGETTER(Providers)(ComSafeArrayAsOutParam(apCloudProviders)));
+
+    for (size_t i = 0; i < apCloudProviders.size(); ++i)
+    {
+        ComPtr<ICloudProvider> pCloudProvider = apCloudProviders[i];
+        com::SafeIfaceArray<ICloudProfile> apCloudProfiles;
+        CHECK_ERROR(pCloudProvider, COMGETTER(Profiles)(ComSafeArrayAsOutParam(apCloudProfiles)));
+        for (size_t j = 0; j < apCloudProfiles.size(); ++j)
+        {
+            ComPtr<ICloudProfile> pCloudProfile = apCloudProfiles[j];
+            Bstr bstrProfileName;
+            pCloudProfile->COMGETTER(Name)(bstrProfileName.asOutParam());
+            RTPrintf("Name:          %ls\n", bstrProfileName.raw());
+            Bstr bstrProviderID;
+            pCloudProfile->COMGETTER(ProviderId)(bstrProviderID.asOutParam());
+            RTPrintf("Provider GUID: %ls\n", bstrProviderID.raw());
+
+            if (fOptLong)
+            {
+                com::SafeArray<BSTR> names;
+                com::SafeArray<BSTR> values;
+                pCloudProfile->GetProperties(Bstr().raw(), ComSafeArrayAsOutParam(names), ComSafeArrayAsOutParam(values));
+                size_t cNames = names.size();
+                size_t cValues = values.size();
+                bool fFirst = true;
+                for (size_t k = 0; k < cNames; k++)
+                {
+                    Bstr value;
+                    if (k < cValues)
+                        value = values[k];
+                    RTPrintf("%s%ls=%ls\n",
+                             fFirst ? "Property:      " : "               ",
+                             names[k], value.raw());
+                    fFirst = false;
+                }
+            }
+
+            RTPrintf("\n");
+        }
+    }
+    return rc;
+}
+
 
 /**
@@ -931 +1020 @@
     kListNatNetworks,
     kListVideoInputDevices,
-    kListScreenShotFormats
+    kListScreenShotFormats,
+    kListCloudProviders,
+    kListCloudProfiles,
 };
 
@@ -1297 +1388 @@
             break;
 
+        case kListCloudProviders:
+            rc = listCloudProviders(pVirtualBox);
+            break;
+
+        case kListCloudProfiles:
+            rc = listCloudProfiles(pVirtualBox, fOptLong);
+            break;
+
         /* No default here, want gcc warnings. */
 
@@ -1349 +1448 @@
         { "webcams",            kListVideoInputDevices,  RTGETOPT_REQ_NOTHING },
         { "screenshotformats",  kListScreenShotFormats,  RTGETOPT_REQ_NOTHING },
+        { "cloudproviders",     kListCloudProviders,     RTGETOPT_REQ_NOTHING },
+        { "cloudprofiles",      kListCloudProfiles,      RTGETOPT_REQ_NOTHING },
     };
 
@@ -1400 +1501 @@
             case kListVideoInputDevices:
             case kListScreenShotFormats:
+            case kListCloudProviders:
+            case kListCloudProfiles:
                 enmOptCommand = (enum enmListType)ch;
                 if (fOptMultiple)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -136 +136 @@
 template<> SHARED_LIBRARY_STUFF bool canConvert<KChipsetType>();
 template<> SHARED_LIBRARY_STUFF bool canConvert<KNATProtocol>();
-template<> SHARED_LIBRARY_STUFF bool canConvert<KCloudProviderId>();
 
 
@@ -254 +253 @@
 template<> SHARED_LIBRARY_STUFF QString toInternalString(const KNATProtocol &protocol);
 template<> SHARED_LIBRARY_STUFF KNATProtocol fromInternalString<KNATProtocol>(const QString &strProtocol);
-template<> SHARED_LIBRARY_STUFF QString toInternalString(const KCloudProviderId &enmProvider);
 
 

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp

@@ -59 +59 @@
 template<> bool canConvert<KChipsetType>() { return true; }
 template<> bool canConvert<KNATProtocol>() { return true; }
-template<> bool canConvert<KCloudProviderId>() { return true; }
 
 
@@ -655 +654 @@
     return values.at(keys.indexOf(QRegExp(strProtocol, Qt::CaseInsensitive)));
 }
-
-/* QString <= KCloudProviderId: */
-template<> QString toInternalString(const KCloudProviderId &enmProvider)
-{
-    switch (enmProvider)
-    {
-        case KCloudProviderId_OCI:            return "OCI";
-        case KCloudProviderId_GCP:            return "GCP";
-        case KCloudProviderId_AWS:            return "AWS";
-        case KCloudProviderId_MicrosoftAzure: return "Microsoft Azure";
-        case KCloudProviderId_IBMCloud:       return "IBM Cloud";
-        case KCloudProviderId_DigitalOcean:   return "Digital Ocean";
-        default: AssertMsgFailed(("No text for %d", enmProvider)); break;
-    }
-    return QString();
-}

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp

@@ -71 +71 @@
     /* Init Cloud Provider Manager: */
     CVirtualBox comVBox = vboxGlobal().virtualBox();
-    m_comCloudProviderManager = comVBox.CreateCloudProviderManager();
+    m_comCloudProviderManager = comVBox.GetCloudProviderManager();
     AssertMsg(comVBox.isOk() && m_comCloudProviderManager.isNotNull(),
               ("Unable to acquire Cloud Provider Manager"));
@@ -117 +117 @@
     AssertReturnVoid(m_pAccountComboBox->count() == 0);
 
-    /* Acquire provider ID list: */
-    QVector<QString> providerIds = m_comCloudProviderManager.GetSupportedProviders();
+    /* Acquire provider list: */
+    QVector<CCloudProvider> comProviders = m_comCloudProviderManager.GetProviders();
     /* Make sure at least one provider is supported: */
-    AssertReturnVoid(!providerIds.isEmpty());
-
-    /* Iterate through provider IDs: */
-    foreach (const QString &strProviderId, providerIds)
-    {
-        /* Acquire Cloud Provider: */
-        const CCloudProvider comProvider = m_comCloudProviderManager.GetProfilesByProvider(strProviderId);
+    AssertReturnVoid(!comProviders.isEmpty());
+
+    /* Iterate through providers: */
+    foreach (const CCloudProvider &comProvider, comProviders)
+    {
         /* Skip if we have nothing to populate (file missing?): */
         if (comProvider.isNull())
             continue;
+        QString strProviderId = comProvider.GetId();
+        QString strProviderShortName = comProvider.GetShortName();
 
         /* Iterate through profile names: */
-        foreach (const QString &strProfileName, comProvider.GetStoredProfilesNames())
+        foreach (const QString &strProfileName, comProvider.GetProfileNames())
         {
             m_pAccountComboBox->addItem(QString());
             m_pAccountComboBox->setItemData(m_pAccountComboBox->count() - 1, strProviderId, ProviderID);
+            m_pAccountComboBox->setItemData(m_pAccountComboBox->count() - 1, strProviderShortName, ProviderName);
             m_pAccountComboBox->setItemData(m_pAccountComboBox->count() - 1, strProfileName, ProfileName);
         }
@@ -142 +143 @@
     /* Set default: */
     if (m_pAccountComboBox->count() != 0)
-        setProviderById("OCI");
+        setProviderById("54e11de4-afcc-47fb-9c39-b24244cfa044");
 }
 
@@ -148 +149 @@
 {
     /* Acquire Cloud Provider: */
-    m_comCloudProvider = m_comCloudProviderManager.GetProfilesByProvider(providerId());
-    /* Return if we have nothing to populate (file missing?): */
-    if (m_comCloudProvider.isNull())
+    CCloudProvider comCloudProvider = m_comCloudProviderManager.GetProviderById(providerId());
+    /* Return if the provider has disappeared: */
+    if (comCloudProvider.isNull())
         return;
+
+    m_comCloudProfile = comCloudProvider.GetProfileByName(profileName());
+    /* Return if the profile has disappeared: */
+    if (m_comCloudProfile.isNull())
 
     /* Clear table initially: */
@@ -159 +164 @@
     QVector<QString> keys;
     QVector<QString> values;
-    values = m_comCloudProvider.GetProfileProperties(profileName(), keys);
+    values = m_comCloudProfile.GetProperties(QString(), keys);
 
     /* Configure table: */
@@ -177 +182 @@
 
             /* Use non-translated description as tool-tip: */
-            const QString strToolTip = m_comCloudProvider.GetPropertyDescription(keys.at(i));
+            const QString strToolTip = m_comCloudProfile.GetPropertyDescription(keys.at(i));
             pItemK->setData(Qt::UserRole, strToolTip);
 
@@ -434 +439 @@
 }
 
-CCloudProvider UIWizardExportAppPage2::provider() const
-{
-    return m_comCloudProvider;
+CCloudProfile UIWizardExportAppPage2::profile() const
+{
+    return m_comCloudProfile;
 }
 
@@ -786 +791 @@
     for (int i = 0; i < m_pAccountComboBox->count(); ++i)
     {
-        if (m_pAccountComboBox->itemData(i, ProviderID).toString() == "OCI")
+        if (m_pAccountComboBox->itemData(i, ProviderID).toString() == "54e11de4-afcc-47fb-9c39-b24244cfa044")
         {
             m_pAccountComboBox->setItemText(i, UIWizardExportApp::tr("Oracle Cloud Infrastructure: %1", "provider: profile")
@@ -794 +799 @@
         {
             m_pAccountComboBox->setItemText(i, UIWizardExportApp::tr("%1: %2", "provider: profile")
-                .arg(m_pAccountComboBox->itemData(i, ProviderID).toString())
+                .arg(m_pAccountComboBox->itemData(i, ProviderName).toString())
                 .arg(m_pAccountComboBox->itemData(i, ProfileName).toString()));
         }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h

@@ -27 +27 @@
 /* COM includes: */
 #include "COMEnums.h"
+#include "CCloudProfile.h"
 #include "CCloudProvider.h"
 #include "CCloudProviderManager.h"
@@ -55 +56 @@
 enum
 {
-    ProviderID  = Qt::UserRole + 1,
-    ProfileName = Qt::UserRole + 2
+    ProviderID      = Qt::UserRole + 1,
+    ProviderName    = Qt::UserRole + 2,
+    ProfileName     = Qt::UserRole + 3
 };
 
@@ -131 +133 @@
     /** Returns profile name. */
     QString profileName() const;
-    /** Returns Cloud Provider object. */
-    CCloudProvider provider() const;
+    /** Returns Cloud Profile object. */
+    CCloudProfile profile() const;
 
     /** Holds the Cloud Provider Manager reference. */
     CCloudProviderManager  m_comCloudProviderManager;
-    /** Holds the Cloud Provider object reference. */
-    CCloudProvider         m_comCloudProvider;
+    /** Holds the Cloud Profile object reference. */
+    CCloudProfile          m_comCloudProfile;
 
     /** Holds the default appliance name. */
@@ -197 +199 @@
     Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected);
     Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
-    Q_PROPERTY(CCloudProvider provider READ provider);
+    Q_PROPERTY(CCloudProfile profile READ profile);
     Q_PROPERTY(QString profileName READ profileName);
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp

@@ -38 +38 @@
 # include "CAppliance.h"
 # include "CCloudClient.h"
-# include "CCloudProvider.h"
+# include "CCloudProfile.h"
 # include "CMachine.h"
 
@@ -57 +57 @@
     m_listCloudClientParameters.clear();
 
-    /* Acquire Cloud Provider: */
-    CCloudProvider comCloudProvider = fieldImp("provider").value<CCloudProvider>();
-    AssertMsgReturnVoid(comCloudProvider.isNotNull(),
-                        ("Cloud provider object is undefined!"));
+    /* Acquire Cloud Profile: */
+    CCloudProfile comCloudProfile = fieldImp("profile").value<CCloudProfile>();
+    AssertMsgReturnVoid(comCloudProfile.isNotNull(),
+                        ("Cloud profile object is undefined!"));
 
     /* Create Cloud Client: */
-    CCloudClient comCloudClient = comCloudProvider.CreateCloudClient(fieldImp("profileName").toString());
-    AssertMsgReturnVoid(comCloudProvider.isOk() && comCloudClient.isNotNull(),
+    CCloudClient comCloudClient = comCloudProfile.CreateCloudClient();
+    AssertMsgReturnVoid(comCloudProfile.isOk() && comCloudClient.isNotNull(),
                         ("Can't create Cloud Client object!"));
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h

@@ -41 +41 @@
     Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected);
     Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
-    Q_PROPERTY(CCloudProvider provider READ provider);
+    Q_PROPERTY(CCloudProfile profile READ profile);
     Q_PROPERTY(QString profileName READ profileName);
     Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget);