Changeset 73716 in vbox

Timestamp:

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

Author:

vboxsync

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

124395

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

Files:

• include/VBox/log.h (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageList.cpp (modified) (5 diffs)
• src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp (modified) (9 diffs)
• src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.h (modified) (4 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/Makefile.kmk (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (9 diffs)
• src/VBox/Main/include/CloudProviderManagerImpl.h (moved) (moved from trunk/src/VBox/Main/include/CloudUserProfileManagerImpl.h ) (4 diffs)
• src/VBox/Main/include/CloudUserProfilesImpl.h (deleted)
• src/VBox/Main/include/ExtPackManagerImpl.h (modified) (2 diffs)
• src/VBox/Main/include/VirtualBoxImpl.h (modified) (2 diffs)
• src/VBox/Main/src-all/ExtPackManagerImpl.cpp (modified) (8 diffs)
• src/VBox/Main/src-all/ProgressImpl.cpp (modified) (3 diffs)
• src/VBox/Main/src-server/CloudProviderManagerImpl.cpp (moved) (moved from trunk/src/VBox/Main/src-server/CloudUserProfileManagerImpl.cpp ) (4 diffs)
• src/VBox/Main/src-server/OCIProfile.cpp (moved) (moved from trunk/src/VBox/Main/src-server/CloudUserProfilesImpl.cpp ) (6 diffs)
• src/VBox/Main/src-server/UnattendedScript.cpp (modified) (2 diffs)
• src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (10 diffs)

trunk/include/VBox/log.h

@@ -362 +362 @@
     /** Main group, ICloudClient. */
     LOG_GROUP_MAIN_CLOUDCLIENT,
+    /** Main group, ICloudProfile. */
+    LOG_GROUP_MAIN_CLOUDPROFILE,
     /** Main group, ICloudProvider. */
     LOG_GROUP_MAIN_CLOUDPROVIDER,
@@ -998 +1000 @@
     "MAIN_CLIPBOARDMODECHANGEDEVENT", \
     "MAIN_CLOUDCLIENT", \
+    "MAIN_CLOUDPROFILE", \
     "MAIN_CLOUDPROVIDER", \
     "MAIN_CLOUDPROVIDERMANAGER", \

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);

trunk/src/VBox/Main/Makefile.kmk

@@ -456 +456 @@
         src-server/ClientWatcher.cpp \
         src-server/ClientToken.cpp \
-        src-server/CloudAPI.cpp \
-        src-server/CloudClientImpl.cpp \
-        src-server/CloudUserProfilesImpl.cpp \
-        src-server/CloudUserProfileManagerImpl.cpp \
+        src-server/CloudProviderManagerImpl.cpp \
+        $(if $(VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK),, \
+                src-server/CloudAPI.cpp \
+                src-server/CloudClientImpl.cpp \
+                src-server/OCIProvider.cpp \
+                src-server/OCIProfile.cpp) \
         src-server/DHCPServerImpl.cpp \
         src-server/NetworkServiceRunner.cpp \

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

@@ -1954 +1954 @@
   <interface
     name="IVirtualBox" extends="$unknown"
-    uuid="9570b9d5-f1a1-448a-10c5-e12f5285adad"
+    uuid="176b85cd-4bc2-453e-9228-f408c5282267"
     wsmap="managed"
     reservedMethods="7" reservedAttributes="12"
@@ -2165 +2165 @@
     </attribute>
 
+    <attribute name="cloudProviderManager" type="ICloudProviderManager" readonly="yes">
+      <desc>
+        The cloud provider manager (singleton).
+      </desc>
+    </attribute>
+
     <method name="composeMachineFilename">
       <desc>
@@ -2448 +2454 @@
       <param name="unattended" type="IUnattended" dir="return">
         <desc>New unattended object.</desc>
-      </param>
-    </method>
-
-    <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>
     </method>
@@ -24865 +24862 @@
 
   <enum
-    name="CloudProviderId"
-    uuid="c3856743-aa5d-404d-847d-14b6cf523677"
-    >
-    <const name="Unknown" value="0"/>
-    <const name="OCI" value="1"/>
-    <const name="GCP" value="2"/>
-    <const name="AWS" value="3"/>
-    <const name="MicrosoftAzure" value="4"/>
-    <const name="IBMCloud" value="5"/>
-    <const name="DigitalOcean" value="6"/>
-  </enum>
-
-  <enum
     name="CloudCommand"
     uuid="1c5cfa19-7754-4071-bf3e-6d21ad432655"
@@ -25110 +25094 @@
 
   <!--
-  // ICloudProvider
+  // ICloudProfile
   //////////////////////////////////////////////////////////////////////////
   -->
 
   <interface
-    name="ICloudProvider" extends="$unknown"
-    uuid="cfadfecb-ef89-41a9-abbd-9772d41baddb"
+    name="ICloudProfile" extends="$unknown"
+    uuid="011d1e9a-a48b-4d15-91a0-6101b087155c"
     wsmap="managed" reservedMethods="4" reservedAttributes="4"
     >
-    <method name="getProvider">
-      <desc>
-        Returns provider Id tied with these profiles
-      </desc>
-      <param name="provider" type="CloudProviderId" dir="return">
-      </param>
-    </method>
-
-    <method name="createProfile">
-      <desc>
-        Creates an empty profile
-      </desc>
-      <param name="profileName" type="wstring" dir="in">
-        <desc>
-          The profile's name
-        </desc>
-      </param>
-      <param name="names" type="wstring" safearray="yes" dir="in">
-        <desc>Names of properties.</desc>
-      </param>
-      <param name="values" type="wstring" safearray="yes" dir="in">
-        <desc>Values of set properties.</desc>
-      </param>
-    </method>
-
-    <method name="updateProfile">
-      <desc>
-        Updates active profile in memory
-      </desc>
-      <param name="profileName" type="wstring" dir="in">
-        <desc>
-          The profile's name
-        </desc>
-      </param>
-      <param name="names" type="wstring" safearray="yes" dir="in">
-        <desc>Names of properties.</desc>
-      </param>
-      <param name="values" type="wstring" safearray="yes" dir="in">
-        <desc>Values of set properties.</desc>
-      </param>
-    </method>
-
-    <method name="getStoredProfilesNames" const="yes">
-      <desc>
-        Returns the names\IDs for the existing profiles in one call.
-      </desc>
-      <param name="profilesNames" type="wstring" safearray="yes" dir="return">
-        <desc>Names of the existing profiles.</desc>
-      </param>
-    </method>
-
-    <method name="getProfileProperties" const="yes">
-      <desc>
-        Returns values for a profile's properties in one call.
-
-        The list of all properties supported by the given profile.
+
+    <attribute name="name" type="wstring" readonly="yes">
+      <desc>
+        Returns the profile name.
+      </desc>
+    </attribute>
+
+    <attribute name="providerId" type="uuid" mod="string" readonly="yes">
+      <desc>
+        Returns provider identifier tied with this profile.
+      </desc>
+    </attribute>
+
+    <attribute name="supportedPropertyNames" type="wstring" safearray="yes" readonly="yes">
+      <desc>
+        Returns the supported property names.
+      </desc>
+    </attribute>
+
+    <method name="getProperty" const="yes">
+      <desc>
+        Returns the value of the cloud profile property with the given name.
+
+        If the requested data @a name does not exist, this function will
+        succeed and return an empty string in the @a value argument.
+
+        <result name="E_INVALIDARG">@a name is @c null or empty.</result>
+      </desc>
+      <param name="name" type="wstring" dir="in">
+        <desc>Name of the property to get.</desc>
+      </param>
+      <param name="value" type="wstring" dir="return">
+        <desc>Current property value.</desc>
+      </param>
+    </method>
+
+    <method name="setProperty" const="yes">
+      <desc>
+        Sets the value of the cloud profile property with the given name.
+
+        Setting the property value to @c null or an empty string is equivalent
+        to deleting the existing value.
+
+        <result name="E_INVALIDARG">@a name is @c null or empty.</result>
+      </desc>
+      <param name="name" type="wstring" dir="in">
+        <desc>Name of the property to set.</desc>
+      </param>
+      <param name="value" type="wstring" dir="in">
+        <desc>Property value to set.</desc>
+      </param>
+    </method>
+
+    <method name="getProperties" const="yes">
+      <desc>
+        Returns values for a group of properties in one call.
+
+        The names of the properties to get are specified using the @a names
+        argument which is a list of comma-separated property names or
+        an empty string if all properties are to be returned.
+        <note>Currently the value of this argument is ignored and the method
+        always returns all existing properties.</note>
 
         The method returns two arrays, the array of property names corresponding
@@ -25181 +25171 @@
         given index in the first array corresponds to an element at the same
         index in the second array.
-
-        For properties that do not have assigned values, an empty string is
-        returned at the appropriate index in the @a returnValues array.
-
-      </desc>
-      <param name="profileName" type="wstring" dir="in">
-        <desc>
-          Name of profile.
+      </desc>
+      <param name="names" type="wstring" dir="in">
+        <desc>
+          Names of properties to get.
         </desc>
       </param>
@@ -25199 +25185 @@
     </method>
 
+    <method name="setProperties">
+      <desc>
+        Updates profile, changing/adding/removing properties.
+
+        The names of the properties to set are passed in the @a names
+        array along with the new values for them in the @a values array. Both
+        arrays have the same number of elements with each element at the given
+        index in the first array corresponding to an element at the same index
+        in the second array.
+
+        If there is at least one property name in @a names that is not valid,
+        the method will fail before changing the values of any other properties
+        from the @a names array.
+
+        Using this method over <link to="#setProperty"/> is preferred if you
+        need to set several properties at once since it is more efficient.
+
+        Setting the property value to @c null or an empty string is equivalent
+        to deleting the existing value.
+      </desc>
+      <param name="names" type="wstring" safearray="yes" dir="in">
+        <desc>Names of properties.</desc>
+      </param>
+      <param name="values" type="wstring" safearray="yes" dir="in">
+        <desc>Values of set properties.</desc>
+      </param>
+    </method>
+
+    <!--- @todo r=klaus Is this the best placement of this method? To me it's
+         not obvious that it processes the object's state at all, and could be
+         moved up to ICloudProvider unless there's any chance that the
+         description changes with the profile. -->
     <method name="getPropertyDescription" const="yes">
       <param name="name" type="wstring" dir="in">
-        <desc>Property name</desc>
+        <desc>Property name.</desc>
       </param>
       <param name="description" type="wstring" dir="return">
-        <desc>Property description</desc>
+        <desc>Property description.</desc>
       </param>
     </method>
@@ -25210 +25228 @@
     <method name="createCloudClient">
       <desc>
-        Creates a cloud client for this cloud provider
+        Creates a cloud client for this cloud profile.
+      </desc>
+      <param name="cloudClient" type="ICloudClient" dir="return">
+        <desc>
+          The cloud client object reference.
+        </desc>
+      </param>
+    </method>
+
+  </interface>
+
+  <!--
+  // ICloudProvider
+  //////////////////////////////////////////////////////////////////////////
+  -->
+
+  <interface
+    name="ICloudProvider" extends="$unknown"
+    uuid="6e500583-602c-49bc-894d-2f53b8e371e9"
+    wsmap="managed" reservedMethods="4" reservedAttributes="4"
+    >
+
+    <attribute name="name" type="wstring" readonly="yes">
+      <desc>Returns the long name of the provider. Includes vendor and precise
+        product name spelled out in the preferred way.</desc>
+    </attribute>
+
+    <attribute name="shortName" type="wstring" readonly="yes">
+      <desc>Returns the short name of the provider. Less than 8 ASCII chars,
+        using acronyms. No vendor name, but can contain a hint if it's a 3rd
+        party implementation for this cloud provider, to keep it unique.</desc>
+    </attribute>
+
+    <attribute name="id" type="uuid" mod="string" readonly="yes">
+      <desc>Returns the UUID of this cloud provider.</desc>
+    </attribute>
+
+    <!-- if there are any generally useful, static pieces of information about
+         a particular cloud provider, please add them here. Maybe a description
+         of the functionality of the cloud provider implementation?-->
+
+    <attribute name="profiles" type="ICloudProfile" safearray="yes" readonly="yes">
+      <desc>Returns all profiles for this cloud provider.</desc>
+    </attribute>
+
+    <attribute name="profileNames" type="wstring" safearray="yes" readonly="yes">
+      <desc>Returns all profile names for this cloud provider.</desc>
+    </attribute>
+
+    <method name="createProfile">
+      <desc>
+        Creates a new profile.
       </desc>
       <param name="profileName" type="wstring" dir="in">
-      </param>
-      <param name="cloudClient" type="ICloudClient" dir="return">
-        <desc>
-          returns interface to the cloud client object
-        </desc>
-      </param>
+        <desc>
+          The profile name. Must not exist, otherwise an error is raised.
+        </desc>
+      </param>
+      <param name="names" type="wstring" safearray="yes" dir="in">
+        <desc>Names of properties.</desc>
+      </param>
+      <param name="values" type="wstring" safearray="yes" dir="in">
+        <desc>Values of set properties.</desc>
+      </param>
+    </method>
+
+    <method name="getProfileByName">
+      <param name="profileName" type="wstring" dir="in"/>
+      <param name="profile" type="ICloudProfile" dir="return"/>
     </method>
 
@@ -25229 +25307 @@
   <interface
     name="ICloudProviderManager" extends="$unknown"
-    uuid="64e276a7-cfd1-48ed-aad3-19368197f3b2"
+    uuid="95533d5b-20ec-4089-b461-f2794c9512df"
     wsmap="managed" reservedMethods="4" reservedAttributes="4"
     >
 
-    <attribute name="supportedProviders" type="wstring" readonly="yes" safearray="yes">
-      <desc>Returns a predefined list of all supported cloud providers.</desc>
-    </attribute>
-
-    <method name="getAllProfiles" const="yes">
-      <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>
-
-    <method name="getProfilesByProvider" const="yes">
-      <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>
+    <attribute name="providers" type="ICloudProvider" safearray="yes" readonly="yes">
+      <desc>Returns all supported cloud providers.</desc>
+    </attribute>
+
+    <method name="getProviderById">
+      <param name="providerId" type="uuid" mod="string" dir="in"/>
+      <param name="provider" type="ICloudProvider" dir="return"/>
+    </method>
+
+    <method name="getProviderByShortName">
+      <param name="providerName" type="wstring" dir="in"/>
+      <param name="provider" type="ICloudProvider" dir="return"/>
+    </method>
+
+    <method name="getProviderByName">
+      <param name="providerName" type="wstring" dir="in"/>
+      <param name="provider" type="ICloudProvider" dir="return"/>
     </method>
 
   </interface>
+
 
   <module name="VBoxSVC" context="LocalServer">

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2018 Oracle Corporation
+ * Copyright (C) 2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -17 +17 @@
 
 
-#ifndef ____H_CLOUDUSERPROFILEMANAGERIMPL
-#define ____H_CLOUDUSERPROFILEMANAGERIMPL
+#ifndef ____H_CLOUDPROVIDERMANAGERIMPL
+#define ____H_CLOUDPROVIDERMANAGERIMPL
 
-/* VBox includes */
 #include "CloudProviderManagerWrap.h"
-#include "CloudUserProfilesImpl.h"
+#ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
+class ExtPackManager;
+#endif
 
-/* VBox forward declarations */
 
 class ATL_NO_VTABLE CloudProviderManager
@@ -30 +30 @@
 {
 public:
-
     DECLARE_EMPTY_CTOR_DTOR(CloudProviderManager)
 
@@ -36 +35 @@
     void FinalRelease();
 
-    HRESULT init(VirtualBox *aVirtualBox);
+    HRESULT init(VirtualBox *aParent);
     void uninit();
 
-private:
-    ComPtr<VirtualBox> const mParent;       /**< Strong reference to the parent object (VirtualBox/IMachine). */
 #ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
-    std::vector<ComPtr<ICloudProviderManager>> mUserProfileManagers;
-#else
-    std::vector<Utf8Str> mSupportedProviders;
+    // Safe helpers, take care of caller and lock themselves.
+    void i_refreshProviders();
 #endif
 
-    HRESULT getSupportedProviders(std::vector<Utf8Str> &aProviderTypes);
-    HRESULT getAllProfiles(std::vector< ComPtr<ICloudProvider> > &aProfilesList);
-    HRESULT getProfilesByProvider(const com::Utf8Str &aProviderName, ComPtr<ICloudProvider> &aProfiles);
+private:
+    // wrapped ICloudProviderManager attributes and methods
+    HRESULT getProviders(std::vector<ComPtr<ICloudProvider> > &aProviders);
+    HRESULT getProviderById(const com::Guid &aProviderId,
+                            ComPtr<ICloudProvider> &aProvider);
+    HRESULT getProviderByShortName(const com::Utf8Str &aProviderName,
+                                   ComPtr<ICloudProvider> &aProvider);
+    HRESULT getProviderByName(const com::Utf8Str &aProviderName,
+                              ComPtr<ICloudProvider> &aProvider);
+
+private:
+#ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
+    ComObjPtr<ExtPackManager> mpExtPackMgr;
+    uint64_t mcExtPackMgrUpdate;
+    std::map<com::Utf8Str, ComPtr<ICloudProviderManager> > m_mapCloudProviderManagers;
+#endif
+
+    std::vector<ComPtr<ICloudProvider> > m_apCloudProviders;
 };
 
-#endif // !____H_CLOUDUSERPROFILEMANAGERIMPL
+#endif // !____H_CLOUDPROVIDERMANAGERIMPL
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */
-

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

@@ -209 +209 @@
     HRESULT     i_doUninstall(const Utf8Str *a_pstrName, bool a_fForcedRemoval, const Utf8Str *a_pstrDisplayInfo);
     void        i_callAllVirtualBoxReadyHooks(void);
-    HRESULT     i_queryObjects(const com::Utf8Str &aObjUuid, std::vector<ComPtr<IUnknown> > &aObjects);
+    HRESULT     i_queryObjects(const com::Utf8Str &aObjUuid, std::vector<ComPtr<IUnknown> > &aObjects, std::vector<com::Utf8Str> *a_pstrExtPackNames);
 #endif
 #ifdef VBOX_COM_INPROC
@@ -228 +228 @@
     bool        i_isExtPackUsable(const char *a_pszExtPack);
     void        i_dumpAllToReleaseLog(void);
+    uint64_t    i_getUpdateCounter(void);
     /** @}  */
 

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

@@ -289 +289 @@
     HRESULT getInternalNetworks(std::vector<com::Utf8Str> &aInternalNetworks);
     HRESULT getGenericNetworkDrivers(std::vector<com::Utf8Str> &aGenericNetworkDrivers);
+    HRESULT getCloudProviderManager(ComPtr<ICloudProviderManager> &aCloudProviderManager);
 
    // wrapped IVirtualBox methods
@@ -313 +314 @@
     HRESULT createAppliance(ComPtr<IAppliance> &aAppliance);
     HRESULT createUnattendedInstaller(ComPtr<IUnattended> &aUnattended);
-    HRESULT createCloudProviderManager(ComPtr<ICloudProviderManager> &aManager);
     HRESULT createMedium(const com::Utf8Str &aFormat,
                          const com::Utf8Str &aLocation,

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -155 +155 @@
 struct ExtPackManager::Data
 {
+    Data()
+        : cUpdate(0)
+    {}
+
     /** The directory where the extension packs are installed. */
     Utf8Str             strBaseDir;
@@ -168 +172 @@
     /** The current context. */
     VBOXEXTPACKCTX      enmContext;
+    /** Update counter for the installed extension packs, increased in every list update. */
+    uint64_t            cUpdate;
 
     RTMEMEF_NEW_AND_DELETE_OPERATORS();
@@ -2002 +2008 @@
                         delete pstrName;
                         if (SUCCEEDED(hrc2))
+                        {
                             m->llInstalledExtPacks.push_back(NewExtPack);
+                            /* Paranoia, there should be no API clients before this method is finished. */
+
+                            m->cUpdate++;
+                        }
                         else if (SUCCEEDED(rc))
                             hrc = hrc2;
@@ -2467 +2478 @@
         {
             m->llInstalledExtPacks.erase(it);
+            m->cUpdate++;
             return;
         }
@@ -2582 +2594 @@
             {
                 m->llInstalledExtPacks.push_back(ptrNewExtPack);
+                m->cUpdate++;
                 if (ptrNewExtPack->m->fUsable)
                     LogRel(("ExtPackManager: Found extension pack '%s'.\n", a_pszName));
@@ -2901 +2914 @@
  * @param   aObjUuid        The UUID of the kind of objects we're querying.
  * @param   aObjects        Where to return the objects.
+ * @param   a_pstrExtPackNames Where to return the corresponding extpack names (may be NULL).
  *
  * @remarks The caller must not hold any locks.
  */
-HRESULT ExtPackManager::i_queryObjects(const com::Utf8Str &aObjUuid, std::vector<ComPtr<IUnknown> > &aObjects)
+HRESULT ExtPackManager::i_queryObjects(const com::Utf8Str &aObjUuid, std::vector<ComPtr<IUnknown> > &aObjects, std::vector<com::Utf8Str> *a_pstrExtPackNames)
 {
     aObjects.clear();
+    if (a_pstrExtPackNames)
+        a_pstrExtPackNames->clear();
 
     AutoCaller autoCaller(this);
@@ -2922 +2938 @@
             HRESULT hrc2 = (*it)->queryObject(aObjUuid, ptrIf);
             if (SUCCEEDED(hrc2))
+            {
                 aObjects.push_back(ptrIf);
+                if (a_pstrExtPackNames)
+                    a_pstrExtPackNames->push_back((*it)->m->Desc.strName);
+            }
             else if (hrc2 != E_NOINTERFACE)
                 hrc = hrc2;
@@ -3243 +3263 @@
 }
 
+/**
+ * Gets the update counter (reflecting extpack list updates).
+ */
+uint64_t ExtPackManager::i_getUpdateCounter(void)
+{
+    AutoCaller autoCaller(this);
+    HRESULT hrc = autoCaller.rc();
+    if (FAILED(hrc))
+        return 0;
+    AutoReadLock autoLock(this COMMA_LOCKVAL_SRC_POS);
+    return m->cUpdate;
+}
+
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

trunk/src/VBox/Main/src-all/ProgressImpl.cpp

@@ -208 +208 @@
     unconst(mId).create();
 
-#if !defined(VBOX_COM_INPROC)
+#if !defined(VBOX_COM_INPROC) && !defined(VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK)
     /* add to the global collection of progress operations (note: after
      * creating mId) */
@@ -327 +327 @@
     unconst(mInitiator).setNull();
 
-#if !defined(VBOX_COM_INPROC)
+#if !defined(VBOX_COM_INPROC) && !defined(VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK)
     if (mParent)
     {
@@ -471 +471 @@
     mErrorInfo = aErrorInfo;
 
-#if !defined VBOX_COM_INPROC
+#if !defined(VBOX_COM_INPROC) && !defined(VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK)
     /* remove from the global collection of pending progress operations */
     if (mParent)

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

@@ -17 +17 @@
 
 
-#include <iprt/path.h>
-#include <iprt/cpp/utils.h>
 #include <VBox/com/array.h>
-#include <map>
-
-#include "CloudUserProfileManagerImpl.h"
-#include "CloudUserProfilesImpl.h"
+
 #include "VirtualBoxImpl.h"
-#include "ExtPackManagerImpl.h"
-#include "Global.h"
-#include "ProgressImpl.h"
-#include "MachineImpl.h"
+#include "CloudProviderManagerImpl.h"
+#ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
+# include "ExtPackManagerImpl.h"
+#else
+# include "OCIProvider.h"
+#endif
 #include "AutoCaller.h"
 #include "Logging.h"
@@ -40 +37 @@
 // ////////////////////////////////////////////////////////////////////////////////
 CloudProviderManager::CloudProviderManager()
-    : mParent(NULL)
 {
 }
@@ -63 +59 @@
 HRESULT CloudProviderManager::init(VirtualBox *aParent)
 {
-    /* Enclose the state transition NotReady->InInit->Ready */
+    // Enclose the state transition NotReady->InInit->Ready.
     AutoInitSpan autoInitSpan(this);
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
-    unconst(mParent) = aParent;
+    m_apCloudProviders.clear();
 
 #ifdef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
-    /*
-     * Engage the extension pack manager and get all the implementations of this class.
-     */
+    // Engage the extension pack manager and get all the implementations of
+    // this class and all implemented cloud providers.
     ExtPackManager *pExtPackMgr = aParent->i_getExtPackManager();
-    std::vector<ComPtr<IUnknown> > Objects;
-    com::Guid idObj(COM_IIDOF(ICloudProviderManager));
-    pExtPackMgr->i_queryObjects(idObj.toString(), Objects);
-    for (unsigned i = 0; i < Objects.size(); i++)
-    {
-        ComPtr<ICloudProviderManager> ptrTmp;
-        HRESULT hrc = Objects[i].queryInterfaceTo(ptrTmp.asOutParam());
-        if (SUCCEEDED(hrc))
-            mUserProfileManagers.push_back(ptrTmp);
+    mpExtPackMgr = pExtPackMgr;
+    if (pExtPackMgr)
+    {
+        mcExtPackMgrUpdate = pExtPackMgr->i_getUpdateCounter();
+        // Make sure that the current value doesn't match, forcing a refresh.
+        mcExtPackMgrUpdate--;
+        iRefreshProviders();
     }
 #else
-
-    mSupportedProviders.clear();
-    mSupportedProviders.push_back("OCI");
-
+    ComObjPtr<OCIProvider> pOCIProvider;
+    HRESULT hrc = pOCIProvider.createObject();
+    if (FAILED(hrc))
+        return hrc;
+    hrc = pOCIProvider->init(aParent);
+    if (FAILED(hrc))
+        return hrc;
+    m_apCloudProviders.push_back(pOCIProvider);
 #endif
 
@@ -97 +94 @@
 void CloudProviderManager::uninit()
 {
-    /* Enclose the state transition Ready->InUninit->NotReady */
+    // Enclose the state transition Ready->InUninit->NotReady.
     AutoUninitSpan autoUninitSpan(this);
     if (autoUninitSpan.uninitDone())
         return;
-
-    unconst(mParent) = NULL;
-}
-
-HRESULT CloudProviderManager::getSupportedProviders(std::vector<Utf8Str> &aSupportedProviders)
-{
+}
+
 #ifdef VBOX_WITH_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<Utf8Str> FromCurrent;
-        HRESULT hrc2 = mUserProfileManagers[i]->COMGETTER(SupportedProviders)(ComSafeArrayAsOutParam(FromCurrent));
-        if (SUCCEEDED(hrc2))
-            for (size_t j = 0; j < FromCurrent.size(); j++)
-                aSupportedProviders.push_back(FromCurrent[j]);
-        else if (SUCCEEDED(hrc))
-            hrc = hrc2;
-    }
-    if (aSupportedProviders.size() > 0)
-        hrc = S_OK;
-    return hrc;
-#else
-    aSupportedProviders = mSupportedProviders;
+void CloudProviderManager::i_refreshProviders()
+{
+    {
+        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+        uint64_t cExtPackMgrUpdate = mpExtPackMgr->i_getUpdateCounter();
+        if (cExtPackMgrUpdate == mcExtPackMgrUpdate)
+            return;
+    }
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    // Reread the current value to figure out if some other thead did the work
+    // already before this thread got hold of the write lock.
+    cExtPackMgrUpdate = pExtPackMgr->i_getUpdateCounter();
+    if (cExtPackMgrUpdate == mcExtPackMgrUpdate)
+        return;
+    mcExtPackMgrUpdate = cExtPackMgrUpdate;
+
+    if (!m_mapCloudProviderManagers.empty())
+    {
+        /// @todo The code below will need to be extended to handle extpack
+        // install and uninstall safely (and the latter needs non-trivial
+        // checks if any extpack related cloud activity is pending.
+        return;
+    }
+
+    std::vector<ComPtr<IUnknown> > apObjects;
+    std::vector<com::Utf8Str> astrExtPackNames;
+    com::Guid idObj(COM_IIDOF(ICloudProviderManager));
+    pExtPackMgr->i_queryObjects(idObj.toString(), apObjects, &astrExtPackNames);
+    for (unsigned i = 0; i < apObjects.size(); i++)
+    {
+        ComPtr<ICloudProviderManager> pTmp;
+        HRESULT hrc = apObjects[i].queryInterfaceTo(pTmp.asOutParam());
+        if (SUCCEEDED(hrc))
+            m_mapCloudProviderManagers[astrExtPackNames[i]] = pTmp;
+        SafeIfaceArray<ICloudProvider> apProvidersFromCurrExtPack;
+        hrc = pTmp->COMGETTER(Providers)(ComSafeArrayAsOutParam(apProvidersFromCurrExtPack));
+        if (SUCCEEDED(hrc))
+        {
+            for (unsigned j = 0; j < apProvidersFromCurrExtPack.size(); j++)
+                m_apCloudProviders.push_back(apProvidersFromCurrExtPack[i]);
+        }
+    }
+}
+#endif
+
+HRESULT CloudProviderManager::getProviders(std::vector<ComPtr<ICloudProvider> > &aProviders)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    aProviders = m_apCloudProviders;
     return S_OK;
-#endif
-}
-
-HRESULT CloudProviderManager::getAllProfiles(std::vector<ComPtr<ICloudProvider> > &aProfilesList)
-{
-#ifdef VBOX_WITH_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<ICloudProvider> FromCurrent;
-        HRESULT hrc2 = mUserProfileManagers[i]->GetAllProfiles(ComSafeArrayAsOutParam(FromCurrent));
-        if (SUCCEEDED(hrc2))
-            for (size_t j = 0; j < FromCurrent.size(); j++)
-                aProfilesList.push_back(FromCurrent[j]);
-        else if (SUCCEEDED(hrc))
-            hrc = hrc2;
-    }
-    if (aProfilesList.size() > 0)
-        hrc = S_OK;
-    return hrc;
-
-#else
-    HRESULT hrc = S_OK;
-    std::vector<ComPtr<ICloudProvider> > lProfilesList;
-    for (size_t i=0;i<mSupportedProviders.size();++i)
-    {
-        ComPtr<ICloudProvider> lProfiles;
-        hrc = getProfilesByProvider(mSupportedProviders.at(i), lProfiles);
-        if (FAILED(hrc))
-            break;
-
-        lProfilesList.push_back(lProfiles);
-    }
-
-    if (SUCCEEDED(hrc))
-        aProfilesList = lProfilesList;
-
-    return hrc;
-#endif
-}
-
-HRESULT CloudProviderManager::getProfilesByProvider(const com::Utf8Str &aProviderName,
-                                                    ComPtr<ICloudProvider> &aProfiles)
-{
-#ifdef VBOX_WITH_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<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))
-            {
-                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))
-                    {
-                        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));
-
-                        ptrCloudProvider = ptrOCIUserProfiles;
-                        hrc = ptrCloudProvider.queryInterfaceTo(aProfiles.asOutParam());
-                    }
-                    else
-                        hrc = setErrorBoth(E_FAIL, VERR_FILE_NOT_FOUND, tr("Could not locate the config file '%s'"),
-                                           szOciConfigPath);
-                }
-                else
-                    hrc = setErrorVrc(vrc);
-            }
-        }
-    }
-
-    return hrc;
-#endif
-}
-
+}
+
+HRESULT CloudProviderManager::getProviderById(const com::Guid &aProviderId,
+                                              ComPtr<ICloudProvider> &aProvider)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    for (size_t i = 0; i < m_apCloudProviders.size(); i++)
+    {
+        Bstr bstrId;
+        HRESULT hrc = m_apCloudProviders[i]->COMGETTER(Id)(bstrId.asOutParam());
+        if (SUCCEEDED(hrc) && aProviderId == bstrId)
+        {
+            aProvider = m_apCloudProviders[i];
+            return S_OK;
+        }
+    }
+    return setError(VBOX_E_OBJECT_NOT_FOUND, tr("Could not find a cloud provider with UUID {%RTuuid}"),
+                    aProviderId.raw());
+}
+
+HRESULT CloudProviderManager::getProviderByShortName(const com::Utf8Str &aProviderName,
+                                                     ComPtr<ICloudProvider> &aProvider)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    for (size_t i = 0; i < m_apCloudProviders.size(); i++)
+    {
+        Bstr bstrName;
+        HRESULT hrc = m_apCloudProviders[i]->COMGETTER(ShortName)(bstrName.asOutParam());
+        if (SUCCEEDED(hrc) && bstrName.equals(aProviderName))
+        {
+            aProvider = m_apCloudProviders[i];
+            return S_OK;
+        }
+    }
+    return setError(VBOX_E_OBJECT_NOT_FOUND, tr("Could not find a cloud provider with short name '%s'"),
+                    aProviderName.c_str());
+}
+
+HRESULT CloudProviderManager::getProviderByName(const com::Utf8Str &aProviderName,
+                                                ComPtr<ICloudProvider> &aProvider)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    for (size_t i = 0; i < m_apCloudProviders.size(); i++)
+    {
+        Bstr bstrName;
+        HRESULT hrc = m_apCloudProviders[i]->COMGETTER(Name)(bstrName.asOutParam());
+        if (SUCCEEDED(hrc) && bstrName.equals(aProviderName))
+        {
+            aProvider = m_apCloudProviders[i];
+            return S_OK;
+        }
+    }
+    return setError(VBOX_E_OBJECT_NOT_FOUND, tr("Could not find a cloud provider with name '%s'"),
+                    aProviderName.c_str());
+}
+

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * ICloudProvider COM class implementations.
+ * ICloudProfile COM class implementation (OCI).
  */
 
@@ -16 +16 @@
  */
 
-
-#include <iprt/path.h>
+#include "OCIProfile.h"
+#include "OCIProvider.h"
+#include "CloudClientImpl.h"
+#include "AutoCaller.h"
+#define LOG_GROUP_MAIN_OVERRIDE LOG_GROUP_MAIN_CLOUDPROFILE
+#include "Logging.h"
+
 #include <iprt/cpp/utils.h>
-#include <VBox/com/array.h>
-
-#include "CloudUserProfilesImpl.h"
-#include "VirtualBoxImpl.h"
-#include "Global.h"
-#include "ProgressImpl.h"
-#include "MachineImpl.h"
-#include "AutoCaller.h"
-#include "Logging.h"
-
-using namespace std;
+
 
 ////////////////////////////////////////////////////////////////////////////////
 //
-// SimpleConfigFile implementation
+// OCIProfile implementation
 //
 ////////////////////////////////////////////////////////////////////////////////
-SimpleConfigFile::SimpleConfigFile(VirtualBoxBase *pSetError, const char *pszFilename)
-    : GeneralTextScript(pSetError, pszFilename)
-{
-    LogRel(("SimpleConfigFile::SimpleConfigFile(VirtualBoxBase *pSetError,...)\n"));
-}
-
-SimpleConfigFile::~SimpleConfigFile()
-{
-    LogRel(("SimpleConfigFile::~SimpleConfigFile()\n"));
-}
-
-HRESULT SimpleConfigFile::parse()
-{
-    LogRel(("Starting to parse the existing profiles\n"));
-    HRESULT hrc = S_OK;
-    hrc = GeneralTextScript::parse();
-    if (SUCCEEDED(hrc))
-    {
-        size_t lines = getLineNumbersOfScript();
-        LogRel(("Initial parsing (GeneralTextScript::parse()) was succeeded \n"));
-        LogRel(("Read lines is %d \n", lines));
-        size_t startSectionPos=0;
-        bool fInSection = false;
-        std::map <Utf8Str, Utf8Str> sectionConfiguration;
-        Utf8Str strSectionName("Default section ");
-
-        for (size_t i=0; i<lines; ++i)
-        {
-            //find the beginning of section, it starts from the line like "[section name]"
-            //next find the end of section, it ends up when we find the beginning
-            //of the next section or reach the end of the contents.
-            //Go through the found lines and split each of them up by "=".
-            //Each correct line must look like "key=value"
-            //if there is not the character "=" in the line one is skipped
-            //class Utf8Str contains the function parseKeyValue() for this action
-            LogRel(("Parsing the line %d \n", i));
-            Utf8Str strLineContent = getContentOfLine(i);
-            if (strLineContent.isEmpty() || strLineContent.startsWith("#"))
-                continue;
-
-            LogRel(("Content of the line %d is %s \n", i, strLineContent.c_str()));
-
-            //strips the white-space characters from the string. It's needed for strings on Windows with "\n\r".
-            strLineContent = strLineContent.strip();
-            if ( strLineContent.startsWith("[") && strLineContent.endsWith("]") )
-            {
-                LogRel(("Found section in the line %d\n", i));
-                if ( fInSection == true )
-                {
-                    if ( i > startSectionPos )//at least we can have here 1 line in the section
-                    {
-                        LogRel(("Add section \"%s\" to the map \n", strSectionName.c_str()));
-                        mSections.insert(make_pair(strSectionName, sectionConfiguration));
-                        sectionConfiguration.clear();
-                        strSectionName.append(Utf8StrFmt("%d",i).c_str());
-                    }
-                }
-
-                strSectionName = strLineContent.substr(strLineContent.find("[")+1,
-                                                       strLineContent.find("]")-1);
-                LogRel(("Section name is \"%s\" \n", strSectionName.c_str()));
-                fInSection = true;
-                startSectionPos = i+1;
-            }
-            else
-            {
-                if ( fInSection == true )
-                {
-                    LogRel(("Continue to parse section \"%s\" \n", strSectionName.c_str()));
-                    if ( i >= startSectionPos )
-                    {
-                        LogRel(("Extracting key and value:\n"));
-                        Utf8Str key, value;
-                        size_t offEnd = strLineContent.parseKeyValue(key, value);
-                        if (offEnd == strLineContent.length())
-                        {
-                            LogRel(("%s=%s \n", key.c_str(), value.c_str()));
-                            sectionConfiguration.insert(make_pair(key,value));
-                        }
-                        else
-                        {
-                            //else something goes wrong, skip the line
-                            LogRel(("Coudn't extract key and value from the line %d\n", i));
-                        }
-                    }
-                }
-                else
-                {
-                    LogRel(("Goes to the next line %d\n", i+1));
-                }
-            }
-        }
-
-        if (fInSection == false)//there is not any section
-        {
-            LogRel(("There are not any sections in the config\n"));
-            hrc = E_FAIL;
-        }
-        else //the last section hasn't a close tag (the close tag is just the beginning of next section)
-        {
-            //just insert the last section into the map
-            LogRel(("Add the last section %s to the map \n", strSectionName.c_str()));
-            mSections.insert(make_pair(strSectionName, sectionConfiguration));
-        }
-    }
-
-    return hrc;
-}
-
-HRESULT SimpleConfigFile::addSection(const Utf8Str &aSectionName, const std::map <Utf8Str, Utf8Str>& section)
-{
-    HRESULT hrc = S_OK;
-    if (aSectionName.isEmpty())
-        hrc = E_FAIL;
-    else
-        mSections.insert(make_pair(aSectionName, section));
-
-    return hrc;
-}
-
-std::vector <Utf8Str> SimpleConfigFile::getSectionsNames() const
-{
-    std::vector <Utf8Str> res;
-    std::map < Utf8Str, std::map <Utf8Str, Utf8Str> >::const_iterator cit = mSections.begin();
-    while (cit!=mSections.end())
-    {
-        res.push_back(cit->first);
-        ++cit;
-    }
-    return res;
-}
-
-std::map <Utf8Str, Utf8Str> SimpleConfigFile::getSectionByName (const Utf8Str &strSectionName) const
-{
-    std::map <Utf8Str, Utf8Str> res;
-    std::map < Utf8Str, std::map <Utf8Str, Utf8Str> >::const_iterator cit;
-    if ( (cit=mSections.find(strSectionName)) != mSections.end() )
-    {
-        res=cit->second;
-    }
-    return res;
-}
-
-HRESULT SimpleConfigFile::updateSection (const Utf8Str &strSectionName,
-                                         const std::map <Utf8Str, Utf8Str> &newSection)
-{
-    HRESULT hrc = S_OK;
-    std::map <Utf8Str, Utf8Str> oldSection = getSectionByName(strSectionName);
-    if (oldSection.empty())
-    {
-        //add new section
-        hrc = addSection(strSectionName, newSection);
-    }
-    else
-    {
-        //update old section by new values or add new pair key/value if there isn't such key
-        std::map <Utf8Str, Utf8Str>::const_iterator cit = newSection.begin();
-        while (cit != newSection.end())
-        {
-            oldSection[cit->first] = cit->second;
-            ++cit;
-        }
-
-    }
-    return hrc;
-}
-
-bool SimpleConfigFile::isSectionExist(const Utf8Str &strSectionName) const
-{
-    return ((mSections.find(strSectionName) == mSections.end()) ? false : true);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// ICloudProvider implementation
-//
-////////////////////////////////////////////////////////////////////////////////
-CloudProvider::CloudProvider()
-    : mParent(NULL)
-{
-}
-
-CloudProvider::~CloudProvider()
-{
-    LogRel(("CloudProvider::~CloudProvider()\n"));
-    unconst(mParent) = NULL;
-}
-
-HRESULT CloudProvider::FinalConstruct()
+OCIProfile::OCIProfile()
+    : mVirtualBox(NULL), mParent(NULL)
+{
+}
+
+OCIProfile::~OCIProfile()
+{
+    LogRel(("OCIProfile::~OCIProfile()\n"));
+    unconst(mVirtualBox) = NULL;
+    unconst(mParent).setNull();
+}
+
+HRESULT OCIProfile::FinalConstruct()
 {
     return BaseFinalConstruct();
 }
 
-void CloudProvider::FinalRelease()
+void OCIProfile::FinalRelease()
 {
     uninit();
@@ -236 +55 @@
 }
 
-void CloudProvider::uninit()
-{
-    /* Enclose the state transition Ready->InUninit->NotReady */
+void OCIProfile::uninit()
+{
+    // Enclose the state transition Ready->InUninit->NotReady.
     AutoUninitSpan autoUninitSpan(this);
     if (autoUninitSpan.uninitDone())
         return;
 
-    unconst(mParent) = NULL;
-}
-
-HRESULT CloudProvider::init(VirtualBox *aParent)
-{
-    /* Enclose the state transition NotReady->InInit->Ready */
+    unconst(mVirtualBox) = NULL;
+    unconst(mParent).setNull();
+}
+
+HRESULT OCIProfile::initFromConfig(VirtualBox *aVirtualBox,
+                                   OCIProvider *aParent,
+                                   const com::Utf8Str &aProfileName)
+{
+    // Enclose the state transition NotReady->InInit->Ready.
     AutoInitSpan autoInitSpan(this);
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
-
+#ifndef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
+    AssertReturn(aVirtualBox, E_INVALIDARG);
+#endif
+    AssertReturn(aParent, E_INVALIDARG);
+    AssertReturn(!aProfileName.isEmpty(), E_INVALIDARG);
+
+    unconst(mVirtualBox) = aVirtualBox;
     unconst(mParent) = aParent;
+    unconst(mName) = aProfileName;
 
     autoInitSpan.setSucceeded();
@@ -258 +87 @@
 }
 
-
-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 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(("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(("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(("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 CloudProvider::getProfileProperties(const com::Utf8Str &aProfileName,
-                                              std::vector<com::Utf8Str> &aReturnNames,
-                                              std::vector<com::Utf8Str> &aReturnValues)
-{
-    LogRel(("CloudProvider::getProfileProperties: %s\n", aProfileName.c_str()));
-    aReturnNames.clear();
-    aReturnValues.clear();
-    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
-}
-
-HRESULT CloudProvider::getPropertyDescription(const com::Utf8Str &aName,
-                                                     com::Utf8Str &aDescription)
-{
-    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(("CloudProvider::createCloudClient: %s\n", aProfileName.c_str()));
-
-    if (aCloudClient.isNull())
-    {
-        LogRel(("aCloudClient is NULL\n"));
-    }
-
-    return setErrorBoth(E_FAIL, VERR_NOT_IMPLEMENTED, tr("Not implemented"));
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// CloudConnectionOCI implementation
-//
-////////////////////////////////////////////////////////////////////////////////
+HRESULT OCIProfile::initNew(VirtualBox *aVirtualBox,
+                            OCIProvider *aParent,
+                            const com::Utf8Str &aProfileName,
+                            const std::vector<com::Utf8Str> &aNames,
+                            const std::vector<com::Utf8Str> &aValues)
+{
+    // Enclose the state transition NotReady->InInit->Ready.
+    AutoInitSpan autoInitSpan(this);
+    AssertReturn(autoInitSpan.isOk(), E_FAIL);
+#ifndef VBOX_WITH_CLOUD_PROVIDERS_IN_EXTPACK
+    AssertReturn(aVirtualBox, E_INVALIDARG);
+#endif
+    AssertReturn(aParent, E_INVALIDARG);
+    AssertReturn(!aProfileName.isEmpty(), E_INVALIDARG);
+
+    unconst(mVirtualBox) = aVirtualBox;
+    unconst(mParent) = aParent;
+    unconst(mName) = aProfileName;
+
+    HRESULT hrc = S_OK;
+    if (!aParent->i_existsProfile(aProfileName))
+        hrc = aParent->i_addProfile(aProfileName, aNames, aValues);
+    else
+        hrc = setError(E_FAIL, tr("Profile '%s' already exists"), aProfileName.c_str());
+
+    if (SUCCEEDED(hrc))
+        autoInitSpan.setSucceeded();
+    return hrc;
+}
+
+void OCIProfile::i_getProfile(StringMap &aProfile) const
+{
+    AutoCaller autoCaller(mParent);
+    if (FAILED(autoCaller.rc()))
+        return;
+    AutoReadLock plock(mParent COMMA_LOCKVAL_SRC_POS);
+
+    mParent->i_getProfileMap(mName, aProfile);
+}
+
+
 static struct
 {
@@ -355 +145 @@
 
 
-OCIUserProfiles::OCIUserProfiles()
-{
-    LogRel(("OCIUserProfiles::OCIUserProfiles()\n"));
-    mpProfiles = new SimpleConfigFile(mParent);
-    LogRel(("Succeeded create SimpleConfigFile\n"));
-}
-
-OCIUserProfiles::~OCIUserProfiles()
-{
-    LogRel(("OCIUserProfiles::~OCIUserProfiles()\n"));
-    if (mpProfiles)
-        delete mpProfiles;
-}
-
-HRESULT OCIUserProfiles::createCloudClient(const com::Utf8Str &aProfileName,
-                                              ComPtr<ICloudClient> &aCloudClient)
-{
-    HRESULT hrc = S_OK;
-    CloudProviderId_T providerId;
-    hrc = getProvider(&providerId);
-
-    ComObjPtr<CloudClient> ptrCloudClient;
-    hrc = ptrCloudClient.createObject();
-    if (SUCCEEDED(hrc))
-    {
-        ComObjPtr<CloudClientOCI> ptrCloudClientOCI;
-        hrc = ptrCloudClientOCI.createObject();
-        AutoReadLock wlock(this COMMA_LOCKVAL_SRC_POS);
-        hrc = ptrCloudClientOCI->initCloudClient(this, mParent, providerId, aProfileName);
-        if (SUCCEEDED(hrc))
-        {
-            ptrCloudClient = ptrCloudClientOCI;
-            hrc = ptrCloudClient.queryInterfaceTo(aCloudClient.asOutParam());
-        }
-    }
-
-    return hrc;
-}
-
-HRESULT OCIUserProfiles::readProfiles(const Utf8Str &strConfigPath)
-{
-    LogRel(("Reading profiles from %s\n", strConfigPath.c_str()));
-    HRESULT hrc = S_OK;
-    if ( !strConfigPath.isEmpty() )
-    {
-        mStrConfigPath = strConfigPath;
-        hrc = mpProfiles->read(mStrConfigPath);
-        if (SUCCEEDED(hrc))
-        {
-            LogRel(("Successfully read the profiles from the config %s\n", mStrConfigPath.c_str()));
-            hrc = mpProfiles->parse();
-            if (FAILED(hrc))
-            {
-                return hrc;
-            }
-            LogRel(("Successfully parsed %d profiles\n", mpProfiles->getNumberOfSections()));
-        }
-    }
-    else
-    {
-        LogRel(("Empty path to config file\n"));
-        hrc = setErrorBoth(E_FAIL, VERR_INVALID_PARAMETER, tr("Empty path to config file"));
-    }
-
-    return hrc;
-}
-
-HRESULT OCIUserProfiles::createProfile(const com::Utf8Str &aProfileName,
-                                          const std::vector<com::Utf8Str> &aNames,
-                                          const std::vector<com::Utf8Str> &aValues)
-{
-    HRESULT hrc = S_OK;
-
-    if (!mpProfiles->isSectionExist(aProfileName))
-    {
-        std::map <Utf8Str, Utf8Str> newProfile;
-
-        for (size_t i=0;i<aNames.size();++i)
-        {
-            com::Utf8Str newValue = (i<aValues.size()) ? aValues.at(i) : "";
-            newProfile[aNames.at(i)] = newValue;
-        }
-
-        hrc = mpProfiles->addSection(aProfileName, newProfile);
-    }
-    else
-        hrc = setErrorBoth(E_FAIL, VERR_ALREADY_EXISTS, tr("Profile '%s' has already exested"), aProfileName.c_str());
-
-    return hrc;
-}
-
-HRESULT OCIUserProfiles::updateProfile(const com::Utf8Str &aProfileName,
-                                          const std::vector<com::Utf8Str> &aNames,
-                                          const std::vector<com::Utf8Str> &aValues)
-{
-    HRESULT hrc = S_OK;
-    if (mpProfiles->isSectionExist(aProfileName))
-    {
-        std::map <Utf8Str, Utf8Str> newProfile;
-
-        for (size_t i=0;i<aNames.size();++i)
-        {
-            com::Utf8Str newValue = (i<aValues.size()) ? aValues.at(i) : "";
-            newProfile[aNames.at(i)] = newValue;
-        }
-
-        hrc = mpProfiles->updateSection(aProfileName, newProfile);
-    }
-    else
-        hrc = setErrorBoth(E_FAIL, VERR_NOT_FOUND, tr("Profile '%s' wasn't found"), aProfileName.c_str());
-
-    return hrc;
-}
-
-HRESULT OCIUserProfiles::getStoredProfilesNames(std::vector<com::Utf8Str> &aProfilesNames)
-{
-    HRESULT hrc = S_OK;
-    aProfilesNames = mpProfiles->getSectionsNames();
-    if (aProfilesNames.empty())
-        hrc = setErrorBoth(E_FAIL, VERR_NOT_FOUND, tr("There aren't any profiles in the config"));
-
-    return hrc;
-}
-
-HRESULT OCIUserProfiles::getProfileProperties(const com::Utf8Str &aProfileName,
-                                                 std::vector<com::Utf8Str> &aReturnNames,
-                                                 std::vector<com::Utf8Str> &aReturnValues)
-{
-    HRESULT hrc = S_OK;
-
-    if (mpProfiles->isSectionExist(aProfileName))
-    {
-        std::map <Utf8Str, Utf8Str> profile;
-        hrc = i_getProfileProperties(aProfileName, profile);
-        if (SUCCEEDED(hrc))
-        {
-            aReturnNames.clear();
-            aReturnValues.clear();
-            std::map <Utf8Str, Utf8Str>::const_iterator cit = profile.begin();
-            while (cit!=profile.end())
-            {
-                aReturnNames.push_back(cit->first);
-                aReturnValues.push_back(cit->second);
-                ++cit;
-            }
-        }
-    }
-    else
-        hrc = setErrorBoth(E_FAIL, VERR_NOT_FOUND, tr("Profile '%s' wasn't found"), aProfileName.c_str());
-
-    return hrc;
-}
-
-HRESULT OCIUserProfiles::getSupportedPropertiesNames(std::vector<com::Utf8Str> &aPropertiesNames)
-{
-    HRESULT hrc = S_OK;
+HRESULT OCIProfile::getName(com::Utf8Str &aName)
+{
+    // mName is constant during life time, no need to lock.
+    aName = mName;
+    return S_OK;
+}
+
+HRESULT OCIProfile::getProviderId(com::Guid &aProviderId)
+{
+    // provider id is constant during life time, no need to lock.
+    aProviderId = mParent->i_getId();
+    return S_OK;
+}
+
+HRESULT OCIProfile::getSupportedPropertyNames(std::vector<com::Utf8Str> &aSupportedPropertyNames)
+{
+    // g_aOCIConfigEntryToDescription is constant during life time, no need to lock.
     for (size_t i = 0; i < RT_ELEMENTS(g_aOCIConfigEntryToDescription); ++i)
-        aPropertiesNames.push_back(g_aOCIConfigEntryToDescription[i].pszOCIConfigEntry);
-    return hrc;
-}
-
-HRESULT OCIUserProfiles::getPropertyDescription(const com::Utf8Str &aName, com::Utf8Str &aDescription)
-{
-    HRESULT hrc = S_OK;
+        aSupportedPropertyNames.push_back(g_aOCIConfigEntryToDescription[i].pszOCIConfigEntry);
+    return S_OK;
+}
+
+HRESULT OCIProfile::getProperty(const com::Utf8Str &aName,
+                                Utf8Str &aReturnValue)
+{
+    AutoCaller autoCaller(mParent);
+    if (FAILED(autoCaller.rc()))
+        return autoCaller.rc();
+    AutoReadLock alock(mParent COMMA_LOCKVAL_SRC_POS);
+    mParent->i_getProfileProperty(mName, aName, aReturnValue);
+    return S_OK;
+}
+
+HRESULT OCIProfile::setProperty(const com::Utf8Str &aName,
+                                const com::Utf8Str &aValue)
+{
+    AutoCaller autoCaller(mParent);
+    if (FAILED(autoCaller.rc()))
+        return autoCaller.rc();
+    AutoWriteLock alock(mParent COMMA_LOCKVAL_SRC_POS);
+    mParent->i_updateProfileProperty(mName, aName, aValue);
+    return S_OK;
+}
+
+HRESULT OCIProfile::getProperties(const com::Utf8Str &aNames,
+                                  std::vector<com::Utf8Str> &aReturnNames,
+                                  std::vector<com::Utf8Str> &aReturnValues)
+{
+    AutoCaller autoCaller(mParent);
+    if (FAILED(autoCaller.rc()))
+        return autoCaller.rc();
+    AutoReadLock alock(mParent COMMA_LOCKVAL_SRC_POS);
+    /// @todo: implement name filtering (everywhere... lots of similar code in many places handling properties. */
+    RT_NOREF(aNames);
+    mParent->i_getProfile(mName, aReturnNames, aReturnValues);
+    return S_OK;
+}
+
+HRESULT OCIProfile::setProperties(const std::vector<com::Utf8Str> &aNames,
+                                  const std::vector<com::Utf8Str> &aValues)
+{
+    AutoCaller autoCaller(mParent);
+    if (FAILED(autoCaller.rc()))
+        return autoCaller.rc();
+    AutoWriteLock alock(mParent COMMA_LOCKVAL_SRC_POS);
+    return mParent->i_updateProfile(mName, aNames, aValues);
+}
+
+HRESULT OCIProfile::getPropertyDescription(const com::Utf8Str &aName, com::Utf8Str &aDescription)
+{
+    // g_aOCIConfigEntryToDescription is constant during life time, no need to lock.
     for (size_t i = 0; i < RT_ELEMENTS(g_aOCIConfigEntryToDescription); ++i)
         if (aName.contains(g_aOCIConfigEntryToDescription[i].pszOCIConfigEntry, Utf8Str::CaseInsensitive))
@@ -524 +221 @@
             aDescription = g_aOCIConfigEntryToDescription[i].pszDesciption;
         }
+    return S_OK;
+}
+
+
+HRESULT OCIProfile::createCloudClient(ComPtr<ICloudClient> &aCloudClient)
+{
+    ComObjPtr<CloudClientOCI> pCloudClientOCI;
+    HRESULT hrc = pCloudClientOCI.createObject();
+    if (FAILED(hrc))
+        return hrc;
+    hrc = pCloudClientOCI->initCloudClient(mVirtualBox, this);
+    if (SUCCEEDED(hrc))
+        hrc = pCloudClientOCI.queryInterfaceTo(aCloudClient.asOutParam());
+
     return hrc;
 }
-
-
-HRESULT OCIUserProfiles::i_createProfile(const com::Utf8Str &aProfileName,
-                                           const std::map <Utf8Str, Utf8Str> &aProfile)
-{
-    HRESULT hrc = S_OK;
-
-    hrc = mpProfiles->addSection(aProfileName, aProfile);
-
-    return hrc;
-}
-
-HRESULT OCIUserProfiles::i_updateProfile(const com::Utf8Str &aProfileName,
-                                           const std::map <Utf8Str, Utf8Str> &aProfile)
-{
-    HRESULT hrc = S_OK;
-    if (mpProfiles->isSectionExist(aProfileName))
-        hrc = mpProfiles->updateSection(aProfileName, aProfile);
-    else
-        hrc = setErrorBoth(E_FAIL, VERR_NOT_FOUND, tr("Profile '%s' wasn't found"), aProfileName.c_str());
-
-
-    return hrc;
-}
-
-HRESULT OCIUserProfiles::i_getProfileProperties(const com::Utf8Str &aProfileName,
-                                                  std::map <Utf8Str, Utf8Str> &aProfile)
-{
-    HRESULT hrc = S_OK;
-    std::map <Utf8Str, Utf8Str> defProfile = mpProfiles->getSectionByName("DEFAULT");
-    std::map <Utf8Str, Utf8Str> reqProfile = mpProfiles->getSectionByName(aProfileName);
-
-    std::map <Utf8Str, Utf8Str>::iterator itDefProfile = defProfile.begin();
-    while (itDefProfile != defProfile.end())
-    {
-        std::map <Utf8Str, Utf8Str>::iterator itProfile = reqProfile.find(itDefProfile->first);
-        if (itProfile == reqProfile.end())
-        {
-            //Add a key=value pair from defProfile into the reqProfile if the key doesn't exist in the reqProfile.
-            reqProfile.insert(*itDefProfile);
-        }
-        ++itDefProfile;
-    }
-
-    if (!reqProfile.empty())
-        aProfile = reqProfile;
-    else
-        hrc = setErrorBoth(E_FAIL, VERR_NOT_FOUND, tr("Profile '%s' wasn't found"), aProfileName.c_str());
-
-    return hrc;
-}
-

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

@@ -196 +196 @@
     return hrc;
 }
+
+#ifdef VBOX_WITH_UNATTENDED
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -636 +638 @@
 }
 
+#endif /* VBOX_WITH_UNATTENDED */
+
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////

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

@@ -80 +80 @@
 #include "Logging.h"
 
-# include "CloudUserProfileManagerImpl.h"
+# include "CloudProviderManagerImpl.h"
 
 #include <QMTranslator.h>
@@ -300 +300 @@
 #endif
 
+    /** The reference to the cloud provider manager singleton. */
+    const ComObjPtr<CloudProviderManager> pCloudProviderManager;
+
     /** The global autostart database for the user. */
     AutostartDb * const                 pAutostartDb;
@@ -472 +475 @@
 
         /* create the system properties object, someone may need it too */
-        unconst(m->pSystemProperties).createObject();
-        rc = m->pSystemProperties->init(this);
+        rc = unconst(m->pSystemProperties).createObject();
+        if (SUCCEEDED(rc))
+            rc = m->pSystemProperties->init(this);
         ComAssertComRCThrowRC(rc);
 
@@ -545 +549 @@
         if (SUCCEEDED(rc = unconst(m->pEventSource).createObject()))
             rc = m->pEventSource->init();
+        if (FAILED(rc)) throw rc;
+
+        /* cloud provider manager */
+        rc = unconst(m->pCloudProviderManager).createObject();
+        if (SUCCEEDED(rc))
+            rc = m->pCloudProviderManager->init(this);
+        ComAssertComRCThrowRC(rc);
         if (FAILED(rc)) throw rc;
     }
@@ -807 +818 @@
      * uninitializing (as for example, mSystemProperties which owns
      * MediumFormat objects which Medium objects refer to) */
+    if (m->pCloudProviderManager)
+    {
+        m->pCloudProviderManager->uninit();
+        unconst(m->pCloudProviderManager).setNull();
+    }
+
     if (m->pSystemProperties)
     {
@@ -826 +843 @@
     }
 #endif /* VBOX_WITH_RESOURCE_USAGE_API */
+
+#ifdef VBOX_WITH_EXTPACK
+    if (m->ptrExtPackManager)
+    {
+        m->ptrExtPackManager->uninit();
+        unconst(m->ptrExtPackManager).setNull();
+    }
+#endif
 
     LogFlowThisFunc(("Terminating the async event handler...\n"));
@@ -1235 +1260 @@
 
     return S_OK;
+}
+
+HRESULT VirtualBox::getCloudProviderManager(ComPtr<ICloudProviderManager> &aCloudProviderManager)
+{
+    HRESULT hrc = m->pCloudProviderManager.queryInterfaceTo(aCloudProviderManager.asOutParam());
+    return hrc;
 }
 
@@ -1820 +1851 @@
 }
 
-HRESULT VirtualBox::createCloudProviderManager(ComPtr<ICloudProviderManager> &aManager)
-{
-    ComObjPtr<CloudProviderManager> ptrCloudProviderManager;
-    HRESULT hrc = ptrCloudProviderManager.createObject();
-    if (SUCCEEDED(hrc))
-    {
-        AutoReadLock wlock(this COMMA_LOCKVAL_SRC_POS);
-        hrc = ptrCloudProviderManager->init(this);
-        if (SUCCEEDED(hrc))
-            hrc = ptrCloudProviderManager.queryInterfaceTo(aManager.asOutParam());
-    }
-    return hrc;
-}
-
 HRESULT VirtualBox::createMedium(const com::Utf8Str &aFormat,
                                  const com::Utf8Str &aLocation,
@@ -5197 +5214 @@
     return rc;
 #else
-    NOREF(aName);
-    NOREF(aNatNetwork);
+    NOREF(aNetworkName);
+    NOREF(aNetwork);
     return E_NOTIMPL;
 #endif
@@ -5233 +5250 @@
     return rc;
 #else
-    NOREF(aName);
     NOREF(aNetworkName);
+    NOREF(aNetwork);
     return E_NOTIMPL;
 #endif