Merge branch '1.4' into 1.5

gns3server/modules/project.py

@@ -459,6 +459,13 @@ class Project:
 
         self._listeners.remove(queue)
 
+    @property
+    def listeners(self):
+        """
+        List of current clients listening for event in this projects
+        """
+        return self._listeners
+
     @asyncio.coroutine
     def list_files(self):
         """

gns3server/modules/qemu/qemu_vm.py

@@ -748,6 +748,9 @@ class QemuVM(BaseVM):
         Changes the process priority
         """
 
+        if self._process_priority == "normal":
+            return
+
         if sys.platform.startswith("win"):
             try:
                 import win32api
@@ -756,7 +759,7 @@ class QemuVM(BaseVM):
             except ImportError:
                 log.error("pywin32 must be installed to change the priority class for QEMU VM {}".format(self._name))
             else:
-                log.info("setting QEMU VM {} priority class to BELOW_NORMAL".format(self._name))
+                log.info("Setting QEMU VM {} priority class to {}".format(self._name, self._process_priority))
                 handle = win32api.OpenProcess(win32con.PROCESS_ALL_ACCESS, 0, self._process.pid)
                 if self._process_priority == "realtime":
                     priority = win32process.REALTIME_PRIORITY_CLASS

gns3server/schemas/qemu.py

@@ -123,7 +123,7 @@ QEMU_CREATE_SCHEMA = {
         },
         "boot_priority": {
             "description": "QEMU boot priority",
-            "enum": ["c", "d"]
+            "enum": ["c", "d", "n", "cn", "cd"]
         },
         "ram": {
             "description": "amount of RAM in MB",

gns3server/templates/layout.html

@@ -16,7 +16,7 @@
     |
     <a href="/backup/projects.tar">Backup projects</a>
     |
-    <a href="/backup/projects.tar">Status</a>
+    <a href="/status">Status</a>
 </div>
 {% block body %}{% endblock %}
 </body>

gns3server/templates/status.html

@@ -6,11 +6,23 @@
 The purpose of this page is to help for GNS3 debug.
 
 <h2>Opened projects</h2>
-<ul>
+<table border="1">
+    <tr>
+        <th>Name</th>
+        <th>ID</td>
+        <th>VMs</th>
+        <th>Clients connected</th>
+    </tr>
 {% for project in project_manager.projects %}
-    <li>{{project.name}} ({{project.id}})</li>
+<tr>
+    <td>{{project.name}}</td>
+    <td>{{project.id}}</td>
+    <td>{{project.vms|length}}</td>    
+    <td>{{project.listeners|length}}</td>
+</tr>
 {% endfor %}
-</ul>
+</table>
+
 
 <h2>Ports reserved by GNS3</h2>
 <h3>TCP</h3>