diff --git a/gns3server/modules/dynamips/__init__.py b/gns3server/modules/dynamips/__init__.py index d26619a1..afd33ff3 100644 --- a/gns3server/modules/dynamips/__init__.py +++ b/gns3server/modules/dynamips/__init__.py @@ -137,7 +137,7 @@ class Dynamips(IModule): self._projects_dir = kwargs["projects_dir"] self._tempdir = kwargs["temp_dir"] self._working_dir = self._projects_dir - self._host = kwargs["host"] + self._host = dynamips_config.get("host", kwargs["host"]) if not sys.platform.startswith("win32"): #FIXME: pickle issues Windows diff --git a/gns3server/modules/iou/__init__.py b/gns3server/modules/iou/__init__.py index a3f0c47d..f72cf5e9 100644 --- a/gns3server/modules/iou/__init__.py +++ b/gns3server/modules/iou/__init__.py @@ -87,11 +87,11 @@ class IOU(IModule): IModule.__init__(self, name, *args, **kwargs) self._iou_instances = {} self._console_start_port_range = iou_config.get("console_start_port_range", 4001) - self._console_end_port_range = iou_config.get("console_end_port_range", 4512) + self._console_end_port_range = iou_config.get("console_end_port_range", 4500) self._allocated_udp_ports = [] self._udp_start_port_range = iou_config.get("udp_start_port_range", 30001) - self._udp_end_port_range = iou_config.get("udp_end_port_range", 40001) - self._host = kwargs["host"] + self._udp_end_port_range = iou_config.get("udp_end_port_range", 35000) + self._host = iou_config.get("host", kwargs["host"]) self._projects_dir = kwargs["projects_dir"] self._tempdir = kwargs["temp_dir"] self._working_dir = self._projects_dir diff --git a/gns3server/modules/virtualbox/__init__.py b/gns3server/modules/virtualbox/__init__.py index 0ff1bb28..999fdaed 100644 --- a/gns3server/modules/virtualbox/__init__.py +++ b/gns3server/modules/virtualbox/__init__.py @@ -93,7 +93,7 @@ class VirtualBox(IModule): self._allocated_udp_ports = [] self._udp_start_port_range = vbox_config.get("udp_start_port_range", 35001) self._udp_end_port_range = vbox_config.get("udp_end_port_range", 35500) - self._host = kwargs["host"] + self._host = vbox_config.get("host", kwargs["host"]) self._projects_dir = kwargs["projects_dir"] self._tempdir = kwargs["temp_dir"] self._working_dir = self._projects_dir diff --git a/gns3server/modules/vpcs/__init__.py b/gns3server/modules/vpcs/__init__.py index 61de9308..0420175f 100644 --- a/gns3server/modules/vpcs/__init__.py +++ b/gns3server/modules/vpcs/__init__.py @@ -81,12 +81,12 @@ class VPCS(IModule): # a new process start when calling IModule IModule.__init__(self, name, *args, **kwargs) self._vpcs_instances = {} - self._console_start_port_range = vpcs_config.get("console_start_port_range", 4512) + self._console_start_port_range = vpcs_config.get("console_start_port_range", 4501) self._console_end_port_range = vpcs_config.get("console_end_port_range", 5000) self._allocated_udp_ports = [] - self._udp_start_port_range = vpcs_config.get("udp_start_port_range", 40001) - self._udp_end_port_range = vpcs_config.get("udp_end_port_range", 40512) - self._host = kwargs["host"] + self._udp_start_port_range = vpcs_config.get("udp_start_port_range", 20501) + self._udp_end_port_range = vpcs_config.get("udp_end_port_range", 21000) + self._host = vpcs_config.get("host", kwargs["host"]) self._projects_dir = kwargs["projects_dir"] self._tempdir = kwargs["temp_dir"] self._working_dir = self._projects_dir