Cleanup VMS when leaving

gns3server/modules/base_manager.py

@@ -49,6 +49,13 @@ class BaseManager:
             cls._instance = cls()
         return cls._instance
 
+    def __del__(self):
+        self.destroy()
+
+    def destroy():
+        """Cleanup the VMS. Call this before closing the server"""
+        cls._instance()
+
     @property
     def module_name(self):
         """

gns3server/modules/base_vm.py

@@ -32,7 +32,8 @@ class BaseVM:
                                                                  name=self.name,
                                                                  uuid=self.uuid))
 
-    # TODO: When delete release console ports
+    def __del__(self):
+        self.destroy()
 
     @property
     def project(self):
@@ -118,3 +119,10 @@ class BaseVM:
         """
 
         raise NotImplementedError
+
+    def destroy(self):
+        """
+        Destroy the VM process.
+        """
+
+        raise NotImplementedError

gns3server/modules/vpcs/vpcs_vm.py

@@ -81,9 +81,6 @@ class VPCSVM(BaseVM):
         else:
             self._console = self._manager.port_manager.get_free_console_port()
 
-    def __del__(self):
-        self.destroy()
-
     def destroy(self):
         self._kill_process()
         if self._console:

gns3server/server.py

@@ -77,7 +77,10 @@ class Server:
         Cleanup the modules (shutdown running emulators etc.)
         """
 
-        # TODO: clean everything from here
+        for module in MODULES:
+            log.debug("Unloading module {}".format(module.__name__))
+            m = module.instance()
+            m.destroy()
         self._loop.stop()
 
     def _signal_handling(self):
@@ -152,8 +155,4 @@ class Server:
 
         # FIXME: remove it in production or in tests
         self._loop.call_later(1, self._reload_hook)
-        try:
+        self._loop.run_forever()
-            self._loop.run_forever()
-        except KeyboardInterrupt:
-            log.info("\nExiting...")
-            self._cleanup()