Changeset 16218 in vbox

Timestamp:

Jan 26, 2009 10:16:38 AM (16 years ago)

Author:

vboxsync

Message:

OVF: Added VirtualBox object member, make the vm name unique & use them on import.

Location:

trunk/src/VBox/Main

Files:

• ApplianceImpl.cpp (modified) (12 diffs)
• include/ApplianceImpl.h (modified) (4 diffs)

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -185 +185 @@
 
 /**
- * Implementation for IAppliance::openAppliance. Loads the given appliance (see API reference).
+ * Implementation for IVirtualBox::openAppliance. Loads the given appliance (see API reference).
  *
  * @param bstrPath Appliance to open (either .ovf or .ova file, see API reference)
@@ -191 +191 @@
  * @return S_OK or error.
  */
-STDMETHODIMP VirtualBox::OpenAppliance(IN_BSTR bstrPath, IAppliance** anAppliance)
+STDMETHODIMP VirtualBox::OpenAppliance (IN_BSTR bstrPath, IAppliance** anAppliance)
 {
     HRESULT rc;
@@ -197 +197 @@
     ComObjPtr<Appliance> appliance;
     appliance.createObject();
-    rc = appliance->init(bstrPath);
+    rc = appliance->init (this, bstrPath);
 //     ComAssertComRCThrowRC(rc);
 
     if (SUCCEEDED(rc))
-    {
         appliance.queryInterfaceTo(anAppliance);
-    }
 
     return rc;
@@ -715 +713 @@
  */
 
-HRESULT Appliance::init(IN_BSTR &path)
+HRESULT Appliance::init (VirtualBox *aVirtualBox, IN_BSTR &path)
 {
     HRESULT rc;
@@ -722 +720 @@
     AutoInitSpan autoInitSpan(this);
     AssertReturn (autoInitSpan.isOk(), E_FAIL);
+
+    /* Weakly reference to a VirtualBox object */
+    unconst (mVirtualBox) = aVirtualBox;
 
     // initialize data
@@ -875 +876 @@
 STDMETHODIMP Appliance::ImportAppliance()
 {
-    /* We need a virtualbox object */
-    ComPtr <IVirtualBox> virtualBox;
-    HRESULT rc = virtualBox.createLocalObject (CLSID_VirtualBox);
-    ComAssertComRCThrowRC (rc);
+    HRESULT rc = S_OK;
 
     list<VirtualSystem>::const_iterator it;
@@ -899 +897 @@
         /* Now that we know the base system get our internal defaults based on that. */
         IGuestOSType *osType = NULL;
-        rc = virtualBox->GetGuestOSType (Bstr (Utf8Str (osTypeVBox.c_str())), &osType);
+        rc = mVirtualBox->GetGuestOSType (Bstr (Utf8Str (osTypeVBox.c_str())), &osType);
         ComAssertComRCThrowRC (rc);
 
         /* Create the machine */
+        /* First get the name */
+        list<VirtualSystemDescriptionEntry> vsdeName = vsd->findByType (VirtualSystemDescriptionType_Name);
+        Assert (vsdeName.size() == 1);
+        string nameVBox = vsdeName.front().strFinalValue;
         IMachine *newMachine = NULL;
-        rc = virtualBox->CreateMachine (Bstr (Utf8StrFmt ("tescht_%d", i)), Bstr (Utf8Str (osTypeVBox.c_str())),
-                                        Bstr (), Guid(),
-                                        &newMachine);
+        rc = mVirtualBox->CreateMachine (Bstr (nameVBox.c_str()), Bstr (osTypeVBox.c_str()),
+                                         Bstr (), Guid(),
+                                         &newMachine);
         ComAssertComRCThrowRC (rc);
 
@@ -963 +965 @@
         }
         /* Now its time to register the machine before we add any hard disks */
-        rc = virtualBox->RegisterMachine (newMachine);
+        rc = mVirtualBox->RegisterMachine (newMachine);
         ComAssertComRCThrowRC (rc);
 
@@ -986 +988 @@
     //  - Appropriate handle errors like not supported file formats
 
+    HRESULT rc = S_OK;
+
     /* Clear any previous virtual system descriptions */
     // @todo: have the entries deleted also?
     m->virtualSystemDescriptions.clear();
 
-    /* We need a virtualbox object */
-    ComPtr <IVirtualBox> virtualBox;
-    HRESULT rc = virtualBox.createLocalObject (CLSID_VirtualBox);
-    ComAssertComRCThrowRC (rc);
-
     /* We need the default path for storing disk images */
     ISystemProperties *systemProps = NULL;
-    rc = virtualBox->COMGETTER(SystemProperties) (&systemProps);
+    rc = mVirtualBox->COMGETTER(SystemProperties) (&systemProps);
     ComAssertComRCThrowRC (rc);
     BSTR defaultHardDiskLocation;
@@ -1015 +1014 @@
         ComAssertComRCThrowRC(rc);
 
-        /* VM name */
-        vsd->addEntry(VirtualSystemDescriptionType_Name, 0, vs.strName, vs.strName);
-
         string osTypeVBox = SchemaDefs_OSTypeId_Other;
         /* Guest OS type */
@@ -1204 +1200 @@
         vsd->addEntry (VirtualSystemDescriptionType_OS, 0, toString<ULONG> (vs.cimos), osTypeVBox);
 
+        /* VM name */
+        /* If the there isn't any name specified create a default one out of
+         * the OS type */
+        string nameVBox = vs.strName;
+        if (nameVBox == "")
+            nameVBox = osTypeVBox;
+        /* @todo: make sure the name is unique (add some numbers if not) */
+        searchUniqueVMName (nameVBox);
+        vsd->addEntry(VirtualSystemDescriptionType_Name, 0, nameVBox, nameVBox);
+
         /* Now that we know the base system get our internal defaults based on that. */
         IGuestOSType *osType = NULL;
-        rc = virtualBox->GetGuestOSType (Bstr (Utf8Str (osTypeVBox.c_str())), &osType);
+        rc = mVirtualBox->GetGuestOSType (Bstr (Utf8Str (osTypeVBox.c_str())), &osType);
         ComAssertComRCThrowRC (rc);
 
@@ -1330 +1336 @@
 }
 
+HRESULT Appliance::searchUniqueVMName (std::string& aName)
+{
+    IMachine *machine = NULL;
+    char *tmpName = RTStrDup (aName.c_str());
+    int i = 1;
+    /* @todo: Maybe to cost intensive; try to find a lighter way */
+    while (mVirtualBox->FindMachine (Bstr (tmpName), &machine) != VBOX_E_OBJECT_NOT_FOUND)
+    {
+        RTStrFree (tmpName);
+        RTStrAPrintf (&tmpName, "%s_%d", aName.c_str(), i);
+        ++i;
+    }
+    aName = tmpName;
+    RTStrFree (tmpName);
+
+    return S_OK;
+}
+
 // IVirtualSystemDescription constructor / destructor
 ////////////////////////////////////////////////////////////////////////////////

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

@@ -26 +26 @@
 
 #include "VirtualBoxBase.h"
+
+class VirtualBox;
 
 class ATL_NO_VTABLE Appliance :
@@ -55 +57 @@
     void FinalRelease() { uninit(); }
 
-    HRESULT init(IN_BSTR &path);
+    HRESULT init (VirtualBox *aVirtualBox, IN_BSTR &path);
     void uninit();
 
@@ -75 +77 @@
     /* private instance data */
 private:
+    /** weak VirtualBox parent */
+    const ComObjPtr <VirtualBox, ComWeakRef> mVirtualBox;
+
     struct Data;            // obscure, defined in AppliannceImpl.cpp
     Data *m;
@@ -84 +89 @@
 
     HRESULT construeAppliance();
+    HRESULT searchUniqueVMName (std::string& aName);
 };