Changeset 75312 in vbox

Timestamp:

Nov 7, 2018 3:44:58 PM (6 years ago)

Author:

vboxsync

Message:

OCI: We now pass subnet, not VCN. Uncovered by better error handling
in the GUI.

Location:

trunk/src/VBox/Main

Files:

• include/ApplianceImplPrivate.h (modified) (1 diff)
• src-server/ApplianceImplExport.cpp (modified) (1 diff)

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

@@ -239 +239 @@
         Utf8Str strBootDiskSize;
         Utf8Str strBucketId;
-        Utf8Str strVCN;
+        Utf8Str strSubnet;
         bool    fPublicIP;
         Utf8Str strUserId;

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

@@ -961 +961 @@
             LogRel(("OCI bucket name: %s\n", m->m_OciExportData.strBucketId.c_str()));
 
-            std::list<VirtualSystemDescriptionEntry*> vcn =
-                vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCIVCN);
-            if (vcn.empty())
+            std::list<VirtualSystemDescriptionEntry*> subnet =
+                vsdescThis->i_findByType(VirtualSystemDescriptionType_CloudOCISubnet);
+            if (subnet.empty())
                 throw rc = setError(VBOX_E_OBJECT_NOT_FOUND,
-                                    tr("OCI: VCN wasn't found"));
-
-            m->m_OciExportData.strVCN = vcn.front()->strVBoxCurrent;
-            LogRel(("OCI VCN name: %s\n", m->m_OciExportData.strVCN.c_str()));
+                                    tr("OCI: Subnet wasn't found"));
+
+            m->m_OciExportData.strSubnet = subnet.front()->strVBoxCurrent;
+            LogRel(("OCI Subnet name: %s\n", m->m_OciExportData.strSubnet.c_str()));
 
             std::list<VirtualSystemDescriptionEntry*> publicIP =