arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 09:18:08 +00:00
Code Issues Releases Wiki Activity

Allow to select the default NAT interface in preferences for local server.

Browse Source
This commit is contained in:
grossmj 2018-03-26 14:23:01 +07:00
parent caa2bda71b
commit 6cec67f79f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/gns3_server.conf
View File

@ -45,7 +45,7 @@ allowed_interfaces = eth0,eth1,virbr0
; Specify the NAT interface to be used by the NAT node ; Specify the NAT interface to be used by the NAT node
; Default is virbr0 on Linux (requires libvirt) and vmnet8 for other platforms (requires VMware) ; Default is virbr0 on Linux (requires libvirt) and vmnet8 for other platforms (requires VMware)
nat_interface = vmnet10 default_nat_interface = vmnet10
[VPCS] [VPCS]
; VPCS executable location, default: search in PATH ; VPCS executable location, default: search in PATH

4
gns3server/compute/builtin/nodes/nat.py
View File

@ -36,12 +36,12 @@ class Nat(Cloud):
def __init__(self, name, node_id, project, manager, ports=None): def __init__(self, name, node_id, project, manager, ports=None):
if sys.platform.startswith("linux"): if sys.platform.startswith("linux"):
nat_interface = Config.instance().get_section_config("Server").get("nat_interface", "virbr0") nat_interface = Config.instance().get_section_config("Server").get("default_nat_interface", "virbr0")
if nat_interface not in [interface["name"] for interface in gns3server.utils.interfaces.interfaces()]: if nat_interface not in [interface["name"] for interface in gns3server.utils.interfaces.interfaces()]:
raise NodeError("NAT interface {} is missing, please install libvirt".format(nat_interface)) raise NodeError("NAT interface {} is missing, please install libvirt".format(nat_interface))
interface = nat_interface interface = nat_interface
else: else:
nat_interface = Config.instance().get_section_config("Server").get("nat_interface", "vmnet8") nat_interface = Config.instance().get_section_config("Server").get("default_nat_interface", "vmnet8")
interfaces = list(filter(lambda x: nat_interface in x.lower(), interfaces = list(filter(lambda x: nat_interface in x.lower(),
[interface["name"] for interface in gns3server.utils.interfaces.interfaces()])) [interface["name"] for interface in gns3server.utils.interfaces.interfaces()]))
if not len(interfaces): if not len(interfaces):