# HG changeset patch
# User mb
# Date 1391006292 -3600
# Node ID 9180aaaf255143cdc4bbb82883eeb876e80d9662
# Parent  42238cd74afe13fb7145197142424146c722d493
bugfix in vmmanager.py

diff -r 42238cd74afe -r 9180aaaf2551 OpenSecurity/bin/vmmanager.py
--- a/OpenSecurity/bin/vmmanager.py	Wed Jan 29 14:25:20 2014 +0100
+++ b/OpenSecurity/bin/vmmanager.py	Wed Jan 29 15:38:12 2014 +0100
@@ -425,9 +425,8 @@
                 if (attached_devices and False) or (connected_device not in attached_devices.values()):
                     new_sdvm = self.generateSDVMName()
                     self.createVM(new_sdvm)
+                    self.storageAttach(new_sdvm)
                     self.attachRSD(new_sdvm, connected_device)
-
-
                     self.startVM(new_sdvm)
                     # wait for machine to come up
                     while new_ip == None:
@@ -450,7 +449,7 @@
             new_ip = self.getHostOnlyIP(vm_name)
         while new_ip not in self.startNotifications:
             time.sleep(1)
-        return
+        return new_ip
     
     # wait for machine to shutdown
     def waitShutdown(self, vm_name):
@@ -461,13 +460,13 @@
     # handles browsing request    
     def handleBrowsingRequest(self):
         if VMManager.handleDeviceChangeLock.acquire(True):
-            new_ip = None
             new_sdvm = self.generateSDVMName()
             self.createVM(new_sdvm)
+            self.storageAttach(new_sdvm)
             self.genCertificateISO(new_sdvm)
             self.attachCertificateISO(new_sdvm)
             self.startVM(new_sdvm)
-            self.waitStartup(new_sdvm)
+            new_ip = self.waitStartup(new_sdvm)
             if new_ip != None:
                 self.mapNetworkDrive('g:', '\\\\' + new_ip + '\\Download', None, None)
             #TODO: cleanup notifications somwhere else (eg. machine shutdown)
@@ -542,7 +541,7 @@
         return string.find(str(result), 'DIR',)
 
     def mapNetworkDrive(self, drive, networkPath, user, password):
-        self.unmapNetworkDrive('h:')
+        self.unmapNetworkDrive(drive)
         #Check for drive availability
         if self.isAvailable(drive) > -1:
             print "Drive letter is already in use: ", drive
@@ -604,7 +603,7 @@
     #man.genCertificateISO('SecurityDVM')
     #man.attachCertificateISO('SecurityDVM')
     #man.isStorageAttached('SecurityDVM')
-    man.guestExecute('SecurityDVM', 'sudo apt-get -y update')
+    #man.guestExecute('SecurityDVM', 'sudo apt-get -y update')
     #man.guestExecute('SecurityDVM', 'sudo apt-get -y upgrade' )
     
     #man.stopVM('SecurityDVM')