1.1 --- a/OpenSecurity/bin/opensecurityd.pyw	Fri Aug 29 11:44:45 2014 +0100
     1.2 +++ b/OpenSecurity/bin/opensecurityd.pyw	Fri Sep 05 12:28:30 2014 +0100
     1.3 @@ -144,37 +144,27 @@
     1.4      """
     1.5      
     1.6      def GET(self):
     1.7 +        global gvm_mgr
     1.8          log_call(web.ctx.environ)
     1.9 -        global gvm_mgr
    1.10  
    1.11 -        gvm_mgr.stop()
    1.12 -        gvm_mgr.cleanup()
    1.13 -        
    1.14 -        if gvm_mgr.vmRootName in gvm_mgr.listVM():
    1.15 -            gvm_mgr.poweroffVM(gvm_mgr.vmRootName)
    1.16 -            tmplateUUID = gvm_mgr.getTemplateUUID()
    1.17 -            if tmplateUUID != None:
    1.18 -                logger.debug('found parent uuid ' + tmplateUUID)
    1.19 -                gvm_mgr.detachStorage(gvm_mgr.vmRootName)
    1.20 -                gvm_mgr.removeSnapshots(tmplateUUID)
    1.21 -                gvm_mgr.removeImage(tmplateUUID)
    1.22 -            else:
    1.23 -                logger.debug('parent uuid not found')
    1.24 -            gvm_mgr.removeVM(gvm_mgr.vmRootName)
    1.25 -        gvm_mgr.removeVMFolder(gvm_mgr.vmRootName)
    1.26 -        
    1.27 -        trace_file_name = os.path.join(Environment('OpenSecurity').log_path, 'OpenSecurity_initial_import.log')
    1.28 -        trace_file = open(trace_file_name, 'w+')
    1.29 -
    1.30 -        vm_image = Cygwin.cygPath(gvm_mgr.getMachineFolder()) + '/OsecVM.ova'
    1.31 -        
    1.32 -        initial_import_script = Cygwin.cygPath(os.path.abspath(os.path.join(os.path.split(__file__)[0], 'initial_vm.sh')))
    1.33 -        Cygwin.bashExecute('\\"' + initial_import_script + '\\" \'' + vm_image + '\'', wait_return = False, stdout = trace_file, stderr = trace_file) 
    1.34 -        res = '{ "init_log": "' + trace_file_name.replace('\\', '\\\\') + '" }'
    1.35 -        
    1.36 +        gvm_mgr.startInitialImport()
    1.37 +        res = '{ "init_log": "' + (Environment('OpenSecurity').log_path+'\\OpenSecurity_initial_import.log').replace('\\', '\\\\') + '" }'
    1.38          return res
    1.39  
    1.40 +class os_update_template:
    1.41 +    """OpenSecurity '/update_template' handler
    1.42 +    
    1.43 +    - GET: update template vm
    1.44 +    """
    1.45 +    
    1.46 +    def GET(self):
    1.47 +        global gvm_mgr
    1.48 +        log_call(web.ctx.environ)
    1.49  
    1.50 +        gvm_mgr.startUpdateTemplate()
    1.51 +        res = '{ "init_log": "' + (Environment('OpenSecurity').log_path+'\\OpenSecurity_initial_import.log').replace('\\', '\\\\') + '" }'
    1.52 +        return res
    1.53 +    
    1.54  class os_initial_image:
    1.55      """OpenSecurity '/initial_image' handler
    1.56      
    1.57 @@ -194,8 +184,7 @@
    1.58              res += '"date": ' + str(os.path.getmtime(t)) + ''
    1.59              res += '}}'
    1.60          return res
    1.61 -
    1.62 -
    1.63 +    
    1.64  class os_root:
    1.65      """OpenSecurity '/' handler
    1.66      
    1.67 @@ -397,23 +386,10 @@
    1.68          global gvm_mgr
    1.69          gvm_mgr.cleanup()
    1.70          gvm_mgr.start()
    1.71 -        global server
    1.72 -        server.run()
    1.73 +        #global server
    1.74 +        #server.run()
    1.75          return None
    1.76  
    1.77 -class os_update_template:
    1.78 -    """OpenSecurity '/update_template' handler
    1.79 -    
    1.80 -    - GET: update template vm
    1.81 -    """
    1.82 -    
    1.83 -    def GET(self):
    1.84 -        #return gvm_mgr.guestExecute('SecurityDVM', 'sudo apt-get -y update')
    1.85 -        global gvm_mgr
    1.86 -        log_call(web.ctx.environ)
    1.87 -        return gvm_mgr.updateTemplate()
    1.88 -
    1.89 -
    1.90  class os_vm:
    1.91      """OpenSecurity '/vms/[VM]' handler
    1.92