diff --git a/gns3server/compute/__init__.py b/gns3server/compute/__init__.py index 174a35e2..65ba86ae 100644 --- a/gns3server/compute/__init__.py +++ b/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) diff --git a/gns3server/compute/traceng/traceng_vm.py b/gns3server/compute/traceng/traceng_vm.py index 54fac0e4..7289394c 100644 --- a/gns3server/compute/traceng/traceng_vm.py +++ b/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: diff --git a/gns3server/controller/__init__.py b/gns3server/controller/__init__.py index 60683e00..e3091374 100644 --- a/gns3server/controller/__init__.py +++ b/gns3server/controller/__init__.py @@ -154,7 +154,7 @@ class Controller: builtins.append(Appliance(uuid.uuid3(uuid.NAMESPACE_DNS, "cloud"), {"node_type": "cloud", "name": "Cloud", "category": 2, "symbol": ":/symbols/cloud.svg"}, builtin=True)) builtins.append(Appliance(uuid.uuid3(uuid.NAMESPACE_DNS, "nat"), {"node_type": "nat", "name": "NAT", "category": 2, "symbol": ":/symbols/cloud.svg"}, builtin=True)) builtins.append(Appliance(uuid.uuid3(uuid.NAMESPACE_DNS, "vpcs"), {"node_type": "vpcs", "name": "VPCS", "default_name_format": "PC-{0}", "category": 2, "symbol": ":/symbols/vpcs_guest.svg", "properties": {"base_script_file": "vpcs_base_config.txt"}}, builtin=True)) - builtins.append(Appliance(uuid.uuid3(uuid.NAMESPACE_DNS, "traceng"), {"node_type": "traceng", "name": "TraceNG", "default_name_format": "TraceNG-{0}", "category": 2, "symbol": ":/symbols/vpcs_guest.svg", "properties": {}}, builtin=True)) # TODO: change default symbol + 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)) builtins.append(Appliance(uuid.uuid3(uuid.NAMESPACE_DNS, "ethernet_switch"), {"node_type": "ethernet_switch", "name": "Ethernet switch", "category": 1, "symbol": ":/symbols/ethernet_switch.svg"}, builtin=True)) 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)) diff --git a/gns3server/handlers/api/compute/__init__.py b/gns3server/handlers/api/compute/__init__.py index e8a1f4ba..e742393e 100644 --- a/gns3server/handlers/api/compute/__init__.py +++ b/gns3server/handlers/api/compute/__init__.py @@ -36,11 +36,11 @@ from .frame_relay_switch_handler import FrameRelaySwitchHandler from .atm_switch_handler import ATMSwitchHandler if sys.platform.startswith("linux") or hasattr(sys, "_called_from_test") or os.environ.get("PYTEST_BUILD_DOCUMENTATION") == "1": - # 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 .iou_handler import IOUHandler from .docker_handler import DockerHandler - # TODO: TraceNG only runs on Windows but test suite works on UNIX platform - #if sys.platform.startswith("win"): - from .traceng_handler import TraceNGHandler +#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_handler import TraceNGHandler diff --git a/gns3server/symbols/traceng.svg b/gns3server/symbols/traceng.svg new file mode 100644 index 00000000..5f4474a0 --- /dev/null +++ b/gns3server/symbols/traceng.svg @@ -0,0 +1,610 @@ + + + + + + + + + + + + hash + + hardware + computer + + + + + Andy Fitzsimon + + + + + Andy Fitzsimon + + + + + Andy Fitzsimon + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +