Changeset 73549 in vbox for trunk/src

Timestamp:

Aug 7, 2018 3:19:57 PM (6 years ago)

Author:

vboxsync

Message:

CloudProviderManager: Sketched how to put the cloud stuff in the extension pack by using pfnQueryObject. To keep it simple, ICloudProviderManager is duplicated in each extpack and the main implementation just aggregate the results. bugref:9152

Location:

trunk/src/VBox/Main

Files:

• include/CloudUserProfileManagerImpl.h (modified) (1 diff)
• src-server/CloudUserProfileManagerImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/include/CloudUserProfileManagerImpl.h

@@ -41 +41 @@
 private:
     ComPtr<VirtualBox> const mParent;       /**< Strong reference to the parent object (VirtualBox/IMachine). */
+#ifdef CLOUD_PROVIDERS_IN_EXTPACK
+    std::vector<ComPtr<ICloudUserProfileManager>> mUserProfileManagers;
+#else
     std::vector<CloudProviderId_T> mSupportedProviders;
+#endif
 
     HRESULT getSupportedProviders(std::vector<CloudProviderId_T> &aProviderTypes);

trunk/src/VBox/Main/src-server/CloudUserProfileManagerImpl.cpp

@@ -25 +25 @@
 #include "CloudUserProfilesImpl.h"
 #include "VirtualBoxImpl.h"
+#include "ExtPackManagerImpl.h"
 #include "Global.h"
 #include "ProgressImpl.h"
@@ -67 +68 @@
 
     unconst(mParent) = aParent;
+
+#ifdef CLOUD_PROVIDERS_IN_EXTPACK
+    /*
+     * Engage the extension pack manager and get all the implementations of this class.
+     */
+    ExtPackManager *pExtPackMgr = aParent->i_getExtPackManager();
+    std::vector<ComPtr<IUnknown> > Objects;
+    com::Guid idObj(COM_IIDOF(ICloudUserProfileManager));
+    pExtPackMgr->i_queryObjects(idObj.toString(), Objects);
+    for (unsigned i = 0; i < Objects.size(); i++)
+    {
+        ComPtr<ICloudUserProfileManager> ptrTmp;
+        HRESULT hrc = Objects[i].queryInterfaceTo(ptrTmp.asOutParam());
+        if (SUCCEEDED(hrc))
+            mUserProfileManagers.push_back(ptrTmp);
+    }
+#else
+
     mSupportedProviders.clear();
     mSupportedProviders.push_back(CloudProviderId_OCI);
+#endif
 
     autoInitSpan.setSucceeded();
@@ -86 +106 @@
 HRESULT CloudUserProfileManager::getSupportedProviders(std::vector<CloudProviderId_T> &aSupportedProviders)
 {
+#ifdef CLOUD_PROVIDERS_IN_EXTPACK
+    /*
+     * Collect all the provider names from all the extension pack objects.
+     */
+    HRESULT hrc = S_OK;
+    for (unsigned i = 0; i < mUserProfileManagers.size(); i++)
+    {
+        SafeArray<CloudProviderId_T> FromCurrent;
+        HRESULT hrc2 = mUserProfileManagers[i]->COMGETTER(SupportedProviders)(ComSafeArrayAsOutParam(FromCurrent));
+        if (SUCCEEDED(hrc2))
+            for (size_t i = 0; i < FromCurrent.size(); i++)
+                aSupportedProviders.push_back(FromCurrent[i]);
+        else if (SUCCEEDED(hrc))
+            hrc = hrc2;
+    }
+    if (aSupportedProviders.size() > 0)
+        hrc = S_OK;
+    return hrc;
+#else
     aSupportedProviders = mSupportedProviders;
     return S_OK;
+#endif
 }
 
 HRESULT CloudUserProfileManager::getAllProfiles(std::vector<ComPtr<ICloudUserProfiles> > &aProfilesList)
 {
+#ifdef CLOUD_PROVIDERS_IN_EXTPACK
+    /*
+     * Collect all the cloud providers from all the extension pack objects.
+     */
+    HRESULT hrc = S_OK;
+    for (unsigned i = 0; i < mUserProfileManagers.size(); i++)
+    {
+        SafeIfaceArray<ICloudUserProfiles> FromCurrent;
+        HRESULT hrc2 = mUserProfileManagers[i]->GetAllProfiles(ComSafeArrayAsOutParam(FromCurrent));
+        if (SUCCEEDED(hrc2))
+            for (size_t i = 0; i < FromCurrent.size(); i++)
+                aProfilesList.push_back(FromCurrent[i]);
+        else if (SUCCEEDED(hrc))
+            hrc = hrc2;
+    }
+    if (aProfilesList.size() > 0)
+        hrc = S_OK;
+    return hrc;
+
+#else
     HRESULT hrc = S_OK;
     std::vector<ComPtr<ICloudUserProfiles> > lProfilesList;
@@ -108 +168 @@
 
     return hrc;
+#endif
 }
 
@@ -113 +174 @@
                                                        ComPtr<ICloudUserProfiles> &aProfiles)
 {
+#ifdef CLOUD_PROVIDERS_IN_EXTPACK
+    /*
+     * Return the first provider we get.
+     */
+    HRESULT hrc = VBOX_E_OBJECT_NOT_FOUND;
+    for (unsigned i = 0; i < mUserProfileManagers.size(); i++)
+    {
+        hrc = mUserProfileManagers[i]->GetProfilesByProvider(aProviderType, aProfiles.asOutParam());
+        if (SUCCEEDED(hrc))
+            break;
+    }
+    return hrc;
+
+#else
+
     ComObjPtr<CloudUserProfiles> ptrCloudUserProfiles;
     HRESULT hrc = ptrCloudUserProfiles.createObject();
@@ -158 +234 @@
 
     return hrc;
-}
-
+#endif
+}
+