Changeset 73571 in vbox

Timestamp:

Aug 8, 2018 4:10:30 PM (6 years ago)

Author:

vboxsync

Message:

bugref:9152. Renamed ICloudUserProfiles to ICloudProvider, ICloudUserProfileManager to ICloudProviderManager. Commented out some code in the frontend. Sergey will rewrite it according to actual realization.

Location:

trunk

Files:

• include/VBox/log.h (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.h (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (5 diffs)
• src/VBox/Main/include/CloudUserProfileManagerImpl.h (modified) (2 diffs)
• src/VBox/Main/include/CloudUserProfilesImpl.h (modified) (3 diffs)
• src/VBox/Main/include/VirtualBoxImpl.h (modified) (1 diff)
• src/VBox/Main/src-server/CloudUserProfileManagerImpl.cpp (modified) (13 diffs)
• src/VBox/Main/src-server/CloudUserProfilesImpl.cpp (modified) (6 diffs)
• src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (1 diff)

trunk/include/VBox/log.h

@@ -362 +362 @@
     /** Main group, ICloudClient. */
     LOG_GROUP_MAIN_CLOUDCLIENT,
-    /** Main group, ICloudUserProfileManager. */
-    LOG_GROUP_MAIN_CLOUDUSERPROFILEMANAGER,
-    /** Main group, ICloudUserProfiles. */
-    LOG_GROUP_MAIN_CLOUDUSERPROFILES,
+    /** Main group, ICloudProvider. */
+    LOG_GROUP_MAIN_CLOUDPROVIDER,
+    /** Main group, ICloudProviderManager. */
+    LOG_GROUP_MAIN_CLOUDPROVIDERMANAGER,
     /** Main group, IConsole. */
     LOG_GROUP_MAIN_CONSOLE,
@@ -998 +998 @@
     "MAIN_CLIPBOARDMODECHANGEDEVENT", \
     "MAIN_CLOUDCLIENT", \
-    "MAIN_CLOUDUSERPROFILEMANAGER", \
-    "MAIN_CLOUDUSERPROFILES", \
+    "MAIN_CLOUDPROVIDER", \
+    "MAIN_CLOUDPROVIDERMANAGER", \
     "MAIN_CONSOLE", \
     "MAIN_CPUCHANGEDEVENT", \

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

@@ -27 +27 @@
 /* COM includes: */
 #include "COMEnums.h"
-#include "CCloudUserProfiles.h"
-#include "CCloudUserProfileManager.h"
+#include "CCloudProvider.h"
+#include "CCloudProviderManager.h"
 
 /* Forward declarations: */
@@ -128 +128 @@
     void setProvider(KCloudProviderId enmProvider);
     /** Returns provider. */
-    KCloudProviderId provider() const;
+//  KCloudProviderId provider() const;
+    QString provider() const;
     /** Returns profile. */
     QString profile() const;
     /** Returns Cloud User-profile object. */
-    CCloudUserProfiles profiles() const;
+    CCloudProvider profiles() const;
 
     /** Holds the Cloud User-profile Manager reference. */
-    CCloudUserProfileManager  m_comCloudUserProfileManager;
+    CCloudProviderManager  m_comCloudProviderManager;
     /** Holds the Cloud User-profile object reference. */
-    CCloudUserProfiles     m_comCloudUserProfiles;
+    CCloudProvider     m_comCloudProvider;
 
     /** Holds the default appliance name. */
@@ -197 +198 @@
     Q_PROPERTY(bool manifestSelected READ isManifestSelected WRITE setManifestSelected);
     Q_PROPERTY(bool includeISOsSelected READ isIncludeISOsSelected WRITE setIncludeISOsSelected);
-    Q_PROPERTY(CCloudUserProfiles profiles READ profiles);
+    Q_PROPERTY(CCloudProvider profiles READ profiles);
     Q_PROPERTY(QString profile READ profile);
 

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

@@ -38 +38 @@
 # include "CAppliance.h"
 # include "CCloudClient.h"
-# include "CCloudUserProfiles.h"
+# include "CCloudProvider.h"
 # include "CMachine.h"
 
@@ -58 +58 @@
 
     /* Acquire Cloud User-profiles: */
-    CCloudUserProfiles comCloudUserProfiles = fieldImp("profiles").value<CCloudUserProfiles>();
-    AssertMsgReturnVoid(comCloudUserProfiles.isNotNull(),
-                        ("Cloud User-profiles object is undefined!"));
+    CCloudProvider comCloudProvider = fieldImp("profiles").value<CCloudProvider>();
+    AssertMsgReturnVoid(comCloudProvider.isNotNull(),
+                        ("Cloud provider object is undefined!"));
 
     /* Create Cloud Client: */
-    CCloudClient comCloudClient = comCloudUserProfiles.CreateCloudClient(fieldImp("profile").toString());
-    AssertMsgReturnVoid(comCloudUserProfiles.isOk() && comCloudClient.isNotNull(),
+    CCloudClient comCloudClient = comCloudProvider.CreateCloudClient(fieldImp("profile").toString());
+    AssertMsgReturnVoid(comCloudProvider.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(CCloudUserProfiles profiles READ profiles);
+    Q_PROPERTY(CCloudProvider profiles READ profiles);
     Q_PROPERTY(QString profile READ profile);
     Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget);

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -2451 +2451 @@
     </method>
 
-    <method name="createCloudUserProfileManager">
-      <desc>
-        Creates a new cloud user profile manager object
-      </desc>
-      <param name="manager" type="ICloudUserProfileManager" dir="return">
+    <method name="createCloudProviderManager">
+      <desc>
+        Creates a new cloud provider manager object
+      </desc>
+      <param name="manager" type="ICloudProviderManager" dir="return">
         <desc>New cloud user profile manager</desc>
       </param>
@@ -25107 +25107 @@
 
   <!--
-  // ICloudUserProfiles
+  // ICloudProvider
   //////////////////////////////////////////////////////////////////////////
   -->
 
   <interface
-    name="ICloudUserProfiles" extends="$unknown"
+    name="ICloudProvider" extends="$unknown"
     uuid="cfadfecb-ef89-41a9-abbd-9772d41baddb"
     wsmap="managed" reservedMethods="4" reservedAttributes="4"
     >
-    <desc>
-        Cloud user profiles description
-    </desc>
-
     <method name="getProvider">
       <desc>
@@ -25225 +25221 @@
 
   <!--
-  // ICloudUserProfileManager
+  // ICloudProviderManager
   //////////////////////////////////////////////////////////////////////////
   -->
   <interface
-    name="ICloudUserProfileManager" extends="$unknown"
+    name="ICloudProviderManager" extends="$unknown"
     uuid="64e276a7-cfd1-48ed-aad3-19368197f3b2"
     wsmap="managed" reservedMethods="4" reservedAttributes="4"
     >
-    <desc>
-        Cloud User Profile Manager description
-    </desc>
-
-    <attribute name="supportedProviders" type="CloudProviderId" readonly="yes" safearray="yes">
+
+    <attribute name="supportedProviders" type="wstring" readonly="yes" safearray="yes">
       <desc>Returns a predefined list of all supported cloud providers.</desc>
     </attribute>
@@ -25243 +25236 @@
     <method name="getAllProfiles" const="yes">
       <desc>
-        Returns the list of the ICloudUserProfiles in one call.
-      </desc>
-      <param name="profileList" type="ICloudUserProfiles" safearray="yes" dir="return">
-        <desc>Returns the list of ICloudUserProfiles.</desc>
+        Returns the list of the ICloudProvider in one call.
+      </desc>
+      <param name="profileList" type="ICloudProvider" safearray="yes" dir="return">
+        <desc>Returns the list of ICloudProvider.</desc>
       </param>
     </method>
@@ -25252 +25245 @@
     <method name="getProfilesByProvider" const="yes">
       <desc>
-        Returns the ICloudUserProfiles for the particular provider.
-      </desc>
-      <param name="providerId" type="CloudProviderId" dir="in">
-      </param>
-      <param name="profile" type="ICloudUserProfiles" dir="return">
-        <desc>Returns the ICloudUserProfiles.</desc>
+        Returns the ICloudProvider for the particular provider.
+      </desc>
+      <param name="providerName" type="wstring" dir="in">
+      </param>
+      <param name="profile" type="ICloudProvider" dir="return">
+        <desc>Returns the ICloudProvider.</desc>
       </param>
     </method>

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

@@ -21 +21 @@
 
 /* VBox includes */
-#include "CloudUserProfileManagerWrap.h"
+#include "CloudProviderManagerWrap.h"
 #include "CloudUserProfilesImpl.h"
 
 /* VBox forward declarations */
 
-class ATL_NO_VTABLE CloudUserProfileManager
-    : public CloudUserProfileManagerWrap
+class ATL_NO_VTABLE CloudProviderManager
+    : public CloudProviderManagerWrap
 {
 public:
 
-    DECLARE_EMPTY_CTOR_DTOR(CloudUserProfileManager)
+    DECLARE_EMPTY_CTOR_DTOR(CloudProviderManager)
 
     HRESULT FinalConstruct();
@@ -42 +42 @@
     ComPtr<VirtualBox> const mParent;       /**< Strong reference to the parent object (VirtualBox/IMachine). */
 #ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
-    std::vector<ComPtr<ICloudUserProfileManager>> mUserProfileManagers;
+    std::vector<ComPtr<ICloudProviderManager>> mUserProfileManagers;
 #else
-    std::vector<CloudProviderId_T> mSupportedProviders;
+    std::vector<Utf8Str> mSupportedProviders;
 #endif
 
-    HRESULT getSupportedProviders(std::vector<CloudProviderId_T> &aProviderTypes);
-    HRESULT getAllProfiles(std::vector< ComPtr<ICloudUserProfiles> > &aProfilesList);
-    HRESULT getProfilesByProvider(CloudProviderId_T aProviderType, ComPtr<ICloudUserProfiles> &aProfiles);
+    HRESULT getSupportedProviders(std::vector<Utf8Str> &aProviderTypes);
+    HRESULT getAllProfiles(std::vector< ComPtr<ICloudProvider> > &aProfilesList);
+    HRESULT getProfilesByProvider(const com::Utf8Str &aProviderName, ComPtr<ICloudProvider> &aProfiles);
 };
 

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

@@ -25 +25 @@
 /* VBox includes */
 #include "CloudClientImpl.h"
-#include "CloudUserProfilesWrap.h"
+#include "CloudProviderWrap.h"
 #include "UnattendedScript.h"
 
@@ -31 +31 @@
 class SimpleConfigFile;
 
-class CloudUserProfiles : public CloudUserProfilesWrap
+class CloudProvider : public CloudProviderWrap
 {
 public:
-    CloudUserProfiles();
-    virtual ~CloudUserProfiles();
+    CloudProvider();
+    virtual ~CloudProvider();
     HRESULT FinalConstruct();
     void FinalRelease();
@@ -68 +68 @@
 
 class OCIUserProfiles :
-    public CloudUserProfiles
+    public CloudProvider
 {
 public:

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

@@ -313 +313 @@
     HRESULT createAppliance(ComPtr<IAppliance> &aAppliance);
     HRESULT createUnattendedInstaller(ComPtr<IUnattended> &aUnattended);
-    HRESULT createCloudUserProfileManager(ComPtr<ICloudUserProfileManager> &aManager);
+    HRESULT createCloudProviderManager(ComPtr<ICloudProviderManager> &aManager);
     HRESULT createMedium(const com::Utf8Str &aFormat,
                          const com::Utf8Str &aLocation,

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * ICloudUserProfileManager  COM class implementations.
+ * ICloudProviderManager  COM class implementations.
  */
 
@@ -36 +36 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// CloudUserProfileManager constructor / destructor
+// CloudProviderManager constructor / destructor
 //
 // ////////////////////////////////////////////////////////////////////////////////
-CloudUserProfileManager::CloudUserProfileManager()
+CloudProviderManager::CloudProviderManager()
     : mParent(NULL)
 {
 }
 
-CloudUserProfileManager::~CloudUserProfileManager()
-{
-}
-
-
-HRESULT CloudUserProfileManager::FinalConstruct()
+CloudProviderManager::~CloudProviderManager()
+{
+}
+
+
+HRESULT CloudProviderManager::FinalConstruct()
 {
     return BaseFinalConstruct();
 }
 
-void CloudUserProfileManager::FinalRelease()
+void CloudProviderManager::FinalRelease()
 {
     uninit();
@@ -61 +61 @@
 }
 
-HRESULT CloudUserProfileManager::init(VirtualBox *aParent)
+HRESULT CloudProviderManager::init(VirtualBox *aParent)
 {
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -75 +75 @@
     ExtPackManager *pExtPackMgr = aParent->i_getExtPackManager();
     std::vector<ComPtr<IUnknown> > Objects;
-    com::Guid idObj(COM_IIDOF(ICloudUserProfileManager));
+    com::Guid idObj(COM_IIDOF(ICloudProviderManager));
     pExtPackMgr->i_queryObjects(idObj.toString(), Objects);
     for (unsigned i = 0; i < Objects.size(); i++)
     {
-        ComPtr<ICloudUserProfileManager> ptrTmp;
+        ComPtr<ICloudProviderManager> ptrTmp;
         HRESULT hrc = Objects[i].queryInterfaceTo(ptrTmp.asOutParam());
         if (SUCCEEDED(hrc))
@@ -87 +87 @@
 
     mSupportedProviders.clear();
-    mSupportedProviders.push_back(CloudProviderId_OCI);
+    mSupportedProviders.push_back("OCI");
+
 #endif
 
@@ -94 +95 @@
 }
 
-void CloudUserProfileManager::uninit()
+void CloudProviderManager::uninit()
 {
     /* Enclose the state transition Ready->InUninit->NotReady */
@@ -104 +105 @@
 }
 
-HRESULT CloudUserProfileManager::getSupportedProviders(std::vector<CloudProviderId_T> &aSupportedProviders)
+HRESULT CloudProviderManager::getSupportedProviders(std::vector<Utf8Str> &aSupportedProviders)
 {
 #ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
@@ -113 +114 @@
     for (unsigned i = 0; i < mUserProfileManagers.size(); i++)
     {
-        SafeArray<CloudProviderId_T> FromCurrent;
+        SafeArray<Utf8Str> FromCurrent;
         HRESULT hrc2 = mUserProfileManagers[i]->COMGETTER(SupportedProviders)(ComSafeArrayAsOutParam(FromCurrent));
         if (SUCCEEDED(hrc2))
@@ -130 +131 @@
 }
 
-HRESULT CloudUserProfileManager::getAllProfiles(std::vector<ComPtr<ICloudUserProfiles> > &aProfilesList)
+HRESULT CloudProviderManager::getAllProfiles(std::vector<ComPtr<ICloudProvider> > &aProfilesList)
 {
 #ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
@@ -139 +140 @@
     for (unsigned i = 0; i < mUserProfileManagers.size(); i++)
     {
-        SafeIfaceArray<ICloudUserProfiles> FromCurrent;
+        SafeIfaceArray<ICloudProvider> FromCurrent;
         HRESULT hrc2 = mUserProfileManagers[i]->GetAllProfiles(ComSafeArrayAsOutParam(FromCurrent));
         if (SUCCEEDED(hrc2))
@@ -153 +154 @@
 #else
     HRESULT hrc = S_OK;
-    std::vector<ComPtr<ICloudUserProfiles> > lProfilesList;
+    std::vector<ComPtr<ICloudProvider> > lProfilesList;
     for (size_t i=0;i<mSupportedProviders.size();++i)
     {
-        ComPtr<ICloudUserProfiles> lProfiles;
+        ComPtr<ICloudProvider> lProfiles;
         hrc = getProfilesByProvider(mSupportedProviders.at(i), lProfiles);
         if (FAILED(hrc))
@@ -171 +172 @@
 }
 
-HRESULT CloudUserProfileManager::getProfilesByProvider(CloudProviderId_T aProviderType,
-                                                       ComPtr<ICloudUserProfiles> &aProfiles)
+HRESULT CloudProviderManager::getProfilesByProvider(const com::Utf8Str &aProviderName,
+                                                    ComPtr<ICloudProvider> &aProfiles)
 {
 #ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
@@ -189 +190 @@
 #else
 
-    ComObjPtr<CloudUserProfiles> ptrCloudUserProfiles;
-    HRESULT hrc = ptrCloudUserProfiles.createObject();
-    switch(aProviderType)
-    {
-        case CloudProviderId_OCI:
-        default:
-            ComObjPtr<OCIUserProfiles> ptrOCIUserProfiles;
-            hrc = ptrOCIUserProfiles.createObject();
+    ComObjPtr<CloudProvider> ptrCloudProvider;
+    HRESULT hrc = ptrCloudProvider.createObject();
+    if (aProviderName.equals("OCI"))
+    {
+        ComObjPtr<OCIUserProfiles> ptrOCIUserProfiles;
+        hrc = ptrOCIUserProfiles.createObject();
+        if (SUCCEEDED(hrc))
+        {
+            AutoReadLock wlock(this COMMA_LOCKVAL_SRC_POS);
+
+            hrc = ptrOCIUserProfiles->init(mParent);
             if (SUCCEEDED(hrc))
             {
-                AutoReadLock wlock(this COMMA_LOCKVAL_SRC_POS);
-
-                hrc = ptrOCIUserProfiles->init(mParent);
-                if (SUCCEEDED(hrc))
+                char szOciConfigPath[RTPATH_MAX];
+                int vrc = RTPathUserHome(szOciConfigPath, sizeof(szOciConfigPath));
+                if (RT_SUCCESS(vrc))
+                    vrc = RTPathAppend(szOciConfigPath, sizeof(szOciConfigPath), ".oci" RTPATH_SLASH_STR "config");
+                if (RT_SUCCESS(vrc))
                 {
-                    char szOciConfigPath[RTPATH_MAX];
-                    int vrc = RTPathUserHome(szOciConfigPath, sizeof(szOciConfigPath));
-                    if (RT_SUCCESS(vrc))
-                        vrc = RTPathAppend(szOciConfigPath, sizeof(szOciConfigPath), ".oci" RTPATH_SLASH_STR "config");
-                    if (RT_SUCCESS(vrc))
+                    LogRel(("config = %s\n", szOciConfigPath));
+                    if (RTFileExists(szOciConfigPath))
                     {
-                        LogRel(("config = %s\n", szOciConfigPath));
-                        if (RTFileExists(szOciConfigPath))
-                        {
-                            hrc = ptrOCIUserProfiles->readProfiles(szOciConfigPath);
-                            if (SUCCEEDED(hrc))
-                                LogRel(("Reading profiles from %s has been done\n", szOciConfigPath));
-                            else
-                                LogRel(("Reading profiles from %s hasn't been done\n", szOciConfigPath));
-
-                            ptrCloudUserProfiles = ptrOCIUserProfiles;
-                            hrc = ptrCloudUserProfiles.queryInterfaceTo(aProfiles.asOutParam());
-                        }
+                        hrc = ptrOCIUserProfiles->readProfiles(szOciConfigPath);
+                        if (SUCCEEDED(hrc))
+                            LogRel(("Reading profiles from %s has been done\n", szOciConfigPath));
                         else
-                            hrc = setErrorBoth(E_FAIL, VERR_FILE_NOT_FOUND, tr("Could not locate the config file '%s'"),
-                                               szOciConfigPath);
+                            LogRel(("Reading profiles from %s hasn't been done\n", szOciConfigPath));
+
+                        ptrCloudProvider = ptrOCIUserProfiles;
+                        hrc = ptrCloudProvider.queryInterfaceTo(aProfiles.asOutParam());
                     }
                     else
-                        hrc = setErrorVrc(vrc);
+                        hrc = setErrorBoth(E_FAIL, VERR_FILE_NOT_FOUND, tr("Could not locate the config file '%s'"),
+                                           szOciConfigPath);
                 }
+                else
+                    hrc = setErrorVrc(vrc);
             }
-            break;
-    }
-
-    return hrc;
-#endif
-}
-
+        }
+    }
+
+    return hrc;
+#endif
+}
+

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * ICloudUserProfiles COM class implementations.
+ * ICloudProvider COM class implementations.
  */
 
@@ -210 +210 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
-// ICloudUserProfiles implementation
+// ICloudProvider implementation
 //
 ////////////////////////////////////////////////////////////////////////////////
-CloudUserProfiles::CloudUserProfiles()
+CloudProvider::CloudProvider()
     : mParent(NULL)
 {
 }
 
-CloudUserProfiles::~CloudUserProfiles()
-{
-    LogRel(("CloudUserProfilesImpl::~CloudUserProfilesImpl()\n"));
+CloudProvider::~CloudProvider()
+{
+    LogRel(("CloudProvider::~CloudProvider()\n"));
     unconst(mParent) = NULL;
 }
 
-HRESULT CloudUserProfiles::FinalConstruct()
+HRESULT CloudProvider::FinalConstruct()
 {
     return BaseFinalConstruct();
 }
 
-void CloudUserProfiles::FinalRelease()
+void CloudProvider::FinalRelease()
 {
     uninit();
@@ -236 +236 @@
 }
 
-void CloudUserProfiles::uninit()
+void CloudProvider::uninit()
 {
     /* Enclose the state transition Ready->InUninit->NotReady */
@@ -246 +246 @@
 }
 
-HRESULT CloudUserProfiles::init(VirtualBox *aParent)
+HRESULT CloudProvider::init(VirtualBox *aParent)
 {
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -259 +259 @@
 
 
-HRESULT CloudUserProfiles::getSupportedPropertiesNames(std::vector<com::Utf8Str> &aPropertiesNames)
-{
-    LogRel(("CloudUserProfiles::getSupportedPropertiesNames:\n"));
+HRESULT CloudProvider::getSupportedPropertiesNames(std::vector<com::Utf8Str> &aPropertiesNames)
+{
+    LogRel(("CloudProvider::getSupportedPropertiesNames:\n"));
     aPropertiesNames.clear();
     return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
 }
 
-HRESULT CloudUserProfiles::readProfiles(const Utf8Str &strConfigPath)
-{
-    LogRel(("CloudUserProfiles::readProfiles: %s\n", strConfigPath.c_str()));
-    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
-}
-
-HRESULT CloudUserProfiles::getProvider(CloudProviderId_T *aProvider)
+HRESULT CloudProvider::readProfiles(const Utf8Str &strConfigPath)
+{
+    LogRel(("CloudProvider::readProfiles: %s\n", strConfigPath.c_str()));
+    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
+}
+
+HRESULT CloudProvider::getProvider(CloudProviderId_T *aProvider)
 {
     *aProvider = CloudProviderId_Unknown;
-    LogRel(("CloudUserProfiles::getProvider: %d\n", *aProvider));
-    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
-}
-
-HRESULT CloudUserProfiles::createProfile(const com::Utf8Str &aProfileName,
+    LogRel(("CloudProvider::getProvider: %d\n", *aProvider));
+    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
+}
+
+HRESULT CloudProvider::createProfile(const com::Utf8Str &aProfileName,
                                             const std::vector<com::Utf8Str> &aNames,
                                             const std::vector<com::Utf8Str> &aValues)
 {
-    LogRel(("CloudUserProfiles::createProfile: %s, %d, %d\n", aProfileName.c_str(), aNames.size(), aValues.size()));
-    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
-}
-
-HRESULT CloudUserProfiles::updateProfile(const com::Utf8Str &aProfileName,
+    LogRel(("CloudProvider::createProfile: %s, %d, %d\n", aProfileName.c_str(), aNames.size(), aValues.size()));
+    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
+}
+
+HRESULT CloudProvider::updateProfile(const com::Utf8Str &aProfileName,
                                             const std::vector<com::Utf8Str> &aNames,
                                             const std::vector<com::Utf8Str> &aValues)
 {
-    LogRel(("CloudUserProfiles::updateProfile: %s, %d, %d\n", aProfileName.c_str(), aNames.size(), aValues.size()));
-    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
-}
-
-HRESULT CloudUserProfiles::getStoredProfilesNames(std::vector<com::Utf8Str> &aProfilesNames)
-{
-
-    LogRel(("CloudUserProfiles::getStoredProfilesNames:\n"));
+    LogRel(("CloudProvider::updateProfile: %s, %d, %d\n", aProfileName.c_str(), aNames.size(), aValues.size()));
+    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
+}
+
+HRESULT CloudProvider::getStoredProfilesNames(std::vector<com::Utf8Str> &aProfilesNames)
+{
+
+    LogRel(("CloudProvider::getStoredProfilesNames:\n"));
     aProfilesNames.clear();
     return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
 }
 
-HRESULT CloudUserProfiles::getProfileProperties(const com::Utf8Str &aProfileName,
+HRESULT CloudProvider::getProfileProperties(const com::Utf8Str &aProfileName,
                                               std::vector<com::Utf8Str> &aReturnNames,
                                               std::vector<com::Utf8Str> &aReturnValues)
 {
-    LogRel(("CloudUserProfiles::getProfileProperties: %s\n", aProfileName.c_str()));
+    LogRel(("CloudProvider::getProfileProperties: %s\n", aProfileName.c_str()));
     aReturnNames.clear();
     aReturnValues.clear();
@@ -313 +313 @@
 }
 
-HRESULT CloudUserProfiles::getPropertyDescription(const com::Utf8Str &aName,
+HRESULT CloudProvider::getPropertyDescription(const com::Utf8Str &aName,
                                                      com::Utf8Str &aDescription)
 {
-    LogRel(("CloudUserProfiles::getPropertyDescription: %s, %s\n", aName.c_str(), aDescription.c_str()));
-    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
-}
-
-HRESULT CloudUserProfiles::createCloudClient(const com::Utf8Str &aProfileName,
+    LogRel(("CloudProvider::getPropertyDescription: %s, %s\n", aName.c_str(), aDescription.c_str()));
+    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
+}
+
+HRESULT CloudProvider::createCloudClient(const com::Utf8Str &aProfileName,
                                                 ComPtr<ICloudClient> &aCloudClient)
 {
-    LogRel(("CloudUserProfiles::createCloudClient: %s\n", aProfileName.c_str()));
+    LogRel(("CloudProvider::createCloudClient: %s\n", aProfileName.c_str()));
 
     if (aCloudClient.isNull())

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

@@ -1820 +1820 @@
 }
 
-HRESULT VirtualBox::createCloudUserProfileManager(ComPtr<ICloudUserProfileManager> &aManager)
-{
-    ComObjPtr<CloudUserProfileManager> ptrCloudUserProfileManager;
-    HRESULT hrc = ptrCloudUserProfileManager.createObject();
+HRESULT VirtualBox::createCloudProviderManager(ComPtr<ICloudProviderManager> &aManager)
+{
+    ComObjPtr<CloudProviderManager> ptrCloudProviderManager;
+    HRESULT hrc = ptrCloudProviderManager.createObject();
     if (SUCCEEDED(hrc))
     {
         AutoReadLock wlock(this COMMA_LOCKVAL_SRC_POS);
-        hrc = ptrCloudUserProfileManager->init(this);
+        hrc = ptrCloudProviderManager->init(this);
         if (SUCCEEDED(hrc))
-            hrc = ptrCloudUserProfileManager.queryInterfaceTo(aManager.asOutParam());
+            hrc = ptrCloudProviderManager.queryInterfaceTo(aManager.asOutParam());
     }
     return hrc;