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

Fix tests.

Browse Source
This commit is contained in:
grossmj 2018-03-15 20:47:42 +07:00
parent aaf59e6050
commit b7e436efdf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ from .cloud import Cloud
from ...error import NodeError from ...error import NodeError
import gns3server.utils.interfaces import gns3server.utils.interfaces
from gns3server.config import Config
import logging import logging
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -35,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 = manager.config.get_section_config("Server").get("nat_interface", "virbr0") nat_interface = Config.instance().get_section_config("Server").get("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 = manager.config.get_section_config("Server").get("nat_interface", "vmnet8") nat_interface = Config.instance().get_section_config("Server").get("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):