Merge branch '2.1' into 2.2

# Conflicts:
#	gns3server/schemas/node.py

gns3server/controller/__init__.py

@@ -116,6 +116,9 @@ class Controller:
         for vm in self._settings.get("VPCS", {}).get("nodes", []):
             vm["node_type"] = "vpcs"
             vms.append(vm)
+        for vm in self._settings.get("TraceNG", {}).get("nodes", []):
+            vm["node_type"] = "traceng"
+            vms.append(vm)
 
         for vm in vms:
             # remove deprecated properties
@@ -154,6 +157,8 @@ class Controller:
         builtins.append(Appliance(uuid.uuid3(uuid.NAMESPACE_DNS, "ethernet_hub"), {"node_type": "ethernet_hub", "name": "Ethernet hub", "category": 1, "symbol": ":/symbols/hub.svg"}, builtin=True))
         builtins.append(Appliance(uuid.uuid3(uuid.NAMESPACE_DNS, "frame_relay_switch"), {"node_type": "frame_relay_switch", "name": "Frame Relay switch", "category": 1, "symbol": ":/symbols/frame_relay_switch.svg"}, builtin=True))
         builtins.append(Appliance(uuid.uuid3(uuid.NAMESPACE_DNS, "atm_switch"), {"node_type": "atm_switch", "name": "ATM switch", "category": 1, "symbol": ":/symbols/atm_switch.svg"}, builtin=True))
+        if sys.platform.startswith("win"):
+            builtins.append(Appliance(uuid.uuid3(uuid.NAMESPACE_DNS, "traceng"), {"node_type": "traceng", "name": "TraceNG", "default_name_format": "TraceNG-{0}", "category": 2, "symbol": ":/symbols/traceng.svg", "properties": {}}, builtin=True))
         for b in builtins:
             self._appliances[b.id] = b
 

gns3server/controller/link.py

@@ -417,6 +417,7 @@ class Link:
         """
         for node in self._nodes:
             if node["node"].node_type in ('vpcs',
+                                          'traceng',
                                           'vmware',
                                           'dynamips',
                                           'qemu',

gns3server/controller/node.py

@@ -120,7 +120,7 @@ class Node:
         return self.node_type not in (
             "qemu", "docker", "dynamips",
             "vpcs", "vmware", "virtualbox",
-            "iou")
+            "iou", "traceng")
 
     @property
     def id(self):
@@ -454,7 +454,7 @@ class Node:
         yield from self.delete()
 
     @asyncio.coroutine
-    def start(self):
+    def start(self, data=None):
         """
         Start a node
         """
@@ -467,7 +467,7 @@ class Node:
                     raise aiohttp.web.HTTPConflict(text="IOU licence is not configured")
                 yield from self.post("/start", timeout=240, data={"iourc_content": licence})
             else:
-                yield from self.post("/start", timeout=240)
+                yield from self.post("/start", data=data, timeout=240)
         except asyncio.TimeoutError:
             raise aiohttp.web.HTTPRequestTimeout(text="Timeout when starting {}".format(self._name))
 
@@ -622,7 +622,7 @@ class Node:
             for port in self._properties["ports_mapping"]:
                 self._ports.append(PortFactory(port["name"], 0, 0, port_number, "ethernet", short_name="e{}".format(port_number)))
                 port_number += 1
-        elif self._node_type in ("vpcs"):
+        elif self._node_type in ("vpcs", "traceng"):
             self._ports.append(PortFactory("Ethernet0", 0, 0, 0, "ethernet", short_name="e0"))
         elif self._node_type in ("cloud", "nat"):
             port_number = 0

gns3server/controller/project.py

@@ -939,7 +939,12 @@ class Project:
         Start all nodes
         """
         pool = Pool(concurrency=3)
+        emit_warning = True
         for node in self.nodes.values():
+            if node.node_type == "traceng" and emit_warning:
+                self.controller.notification.emit("log.warning", {"message": "TraceNG nodes must be started one by one"})
+                emit_warning = False
+                continue
             pool.append(node.start)
         yield from pool.join()