From cb6df28f598b00a51b00f0c9dd83ba5da0af17f1 Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 21 May 2016 17:42:34 -0600 Subject: [PATCH] Fixes disabling the VPCS relay feature. Fixes #521. --- gns3server/modules/port_manager.py | 2 +- gns3server/modules/vpcs/vpcs_vm.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gns3server/modules/port_manager.py b/gns3server/modules/port_manager.py index f3846bd8..bcaa74af 100644 --- a/gns3server/modules/port_manager.py +++ b/gns3server/modules/port_manager.py @@ -106,7 +106,7 @@ class PortManager: return self._udp_host @udp_host.setter - def host(self, new_host): + def udp_host(self, new_host): self._udp_host = new_host diff --git a/gns3server/modules/vpcs/vpcs_vm.py b/gns3server/modules/vpcs/vpcs_vm.py index 054ed47e..16984918 100644 --- a/gns3server/modules/vpcs/vpcs_vm.py +++ b/gns3server/modules/vpcs/vpcs_vm.py @@ -419,8 +419,10 @@ class VPCSVM(BaseVM): command.extend(["-m", str(self._manager.get_mac_id(self.id))]) # 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 - if self._vpcs_version > parse_version("0.8"): - command.extend(["-R"]) # disable relay feature of VPCS (starting with VPCS 0.8) + if self._vpcs_version >= parse_version("0.8b"): + command.extend(["-R"]) # disable the relay feature of VPCS (starting with VPCS 0.8) + else: + log.warn("The VPCS relay feature could not be disabled because the VPCS version is below 0.8b") nio = self._ethernet_adapter.get_nio(0) if nio: