Changeset 75920 in vbox for trunk/src/VBox/Main

Timestamp:

Dec 3, 2018 6:17:11 PM (6 years ago)

Author:

vboxsync

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

127126

Message:

bugref:9311. Added support of cloud export into VBoxManage.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• include/ApplianceImpl.h (modified) (1 diff)
• include/ApplianceImplPrivate.h (modified) (2 diffs)
• src-server/ApplianceImpl.cpp (modified) (2 diffs)

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

@@ -3646 +3646 @@
     <const name="CloudOCIVCN" value="31" />
     <const name="CloudOCIPublicIP" value="32" />
-    <const name="CloudOCIProfilePath" value="33" />
+    <const name="CloudOCIProfileName" value="33" />
     <const name="CloudOCISubnet" value="34" />
     <const name="CloudOCIKeepObject" value="35" />
@@ -3852 +3852 @@
     </method>
 
+    <method name="removeDescriptionByType">
+      <desc>Delete all records which are equal to the passed type from the list</desc>
+
+      <param name="type" type="VirtualSystemDescriptionType" dir="in">
+        <desc></desc>
+      </param>
+    </method>
+
     <method name="getValuesByType">
       <desc>This is the same as <link to="#getDescriptionByType" /> except that you can specify which

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

@@ -320 +320 @@
                            const com::Utf8Str &aVBoxValue,
                            const com::Utf8Str &aExtraConfigValue);
+    HRESULT removeDescriptionByType(VirtualSystemDescriptionType_T aType);
     void i_removeByType(VirtualSystemDescriptionType_T aType);
 

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

@@ -54 +54 @@
       : storageType(VFSType_File) {}
     VFSType_T storageType; /* Which type of storage should be handled */
+    Utf8Str strProvider;   /* cloud provider name in case of export/import to Cloud */
     Utf8Str strPath;       /* File path for the import/export */
     Utf8Str strHostname;   /* Hostname on remote storage locations (could be empty) */
@@ -230 +231 @@
     /** Number of passwords provided. */
     uint32_t                  m_cPwProvided;
-
-    struct CloudExportData_T {
-        Utf8Str strDisplayMachineName;
-        Utf8Str strProfileFilePath;
-        Utf8Str strProfileName;
-        Utf8Str strInstanceShapeId;
-        Utf8Str strDomainName;
-        Utf8Str strBootDiskSize;
-        Utf8Str strBucketId;
-        Utf8Str strSubnet;
-        bool    fPublicIP;
-        Utf8Str strUserId;
-        Utf8Str strBootImageName;
-    };
-
-    CloudExportData_T m_CloudExportData;
 };
 

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

@@ -1336 +1336 @@
     {
         locInfo.storageType = VFSType_Cloud;
+        locInfo.strProvider = "OCI";
         strUri = strUri.substr(sizeof("OCI://") - 1);
     }
@@ -1628 +1629 @@
 }
 
+HRESULT VirtualSystemDescription::removeDescriptionByType(VirtualSystemDescriptionType_T aType)
+{
+    std::vector<VirtualSystemDescriptionEntry>::iterator it = m->maDescriptions.begin();
+    while (it != m->maDescriptions.end())
+    {
+        if (it->type == aType)
+            it = m->maDescriptions.erase(it);
+        else
+            ++it;
+    }
+
+    return S_OK;
+}
+
 /* Private method; delete all records from the list
  * m->llDescriptions that match the given type.