Custom icons and small fixes for TraceNG integration.

gns3server/compute/__init__.py

@@ -28,16 +28,14 @@ from .vmware import VMware
 MODULES = [Builtin, VPCS, VirtualBox, Dynamips, Qemu, VMware]
 
 if sys.platform.startswith("linux") or hasattr(sys, "_called_from_test") or os.environ.get("PYTEST_BUILD_DOCUMENTATION") == "1":
-
-    from .docker import Docker
-    MODULES.append(Docker)
-
-    # IOU only runs on Linux but test suite works on UNIX platform
+    # IOU & Docker only runs on Linux but test suite works on UNIX platform
     if not sys.platform.startswith("win"):
+        from .docker import Docker
+        MODULES.append(Docker)
         from .iou import IOU
         MODULES.append(IOU)
 
-    # TODO: TraceNG only runs on Windows but test suite works on UNIX platform
-    #if sys.platform.startswith("win"):
-    from .traceng import TraceNG
-    MODULES.append(TraceNG)
+#if sys.platform.startswith("win") or hasattr(sys, "_called_from_test") or os.environ.get("PYTEST_BUILD_DOCUMENTATION") == "1":
+# FIXME: TraceNG only runs on Windows but test suite works on UNIX platform
+from .traceng import TraceNG
+MODULES.append(TraceNG)

gns3server/compute/traceng/traceng_vm.py

@@ -392,7 +392,11 @@ class TraceNGVM(BaseNode):
 
         command = [self._traceng_path()]
 
-        #command.extend(["-p", str(self._internal_console_port)])  # listen to console port
+        # TODO: remove when testing with  executable
+        command.extend(["-p", str(self._internal_console_port)])  # listen to console port
+        command.extend(["-m", "1"])   # the unique ID is used to set the MAC address offset
+        command.extend(["-i", "1"])  # option to start only one VPC instance
+        command.extend(["-F"])  # option to avoid the daemonization of VPCS
 
         # use the local UDP tunnel to uBridge instead
         if not self._local_udp_tunnel: