NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-08-27 12:30:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2' into 3.1

Browse Source 
# Conflicts:
#	gns3server/compute/builtin/nodes/cloud.py
#	gns3server/utils/interfaces.py
This commit is contained in:
grossmj 2026-08-18 18:05:56 +02:00
commit 52de01523f
No known key found for this signature in database
GPG Key ID: 1E7DD6DBB53FF3D7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/compute/builtin/nodes/cloud.py
View File

@ -330,7 +330,7 @@ class Cloud(BaseNode):
f"Interface '{port_info['interface']}' could not be found on this system, please update '{self.name}'" f"Interface '{port_info['interface']}' could not be found on this system, please update '{self.name}'"
) )
if sys.platform.startswith("linux"): if sys.platform.startswith("linux") or sys.platform.startswith("openbsd"):
await self._add_linux_ethernet(port_info, bridge_name) await self._add_linux_ethernet(port_info, bridge_name)
elif sys.platform.startswith("darwin"): elif sys.platform.startswith("darwin"):
await self._add_osx_ethernet(port_info, bridge_name) await self._add_osx_ethernet(port_info, bridge_name)

3
gns3server/utils/interfaces.py
View File

@ -159,7 +159,7 @@ def is_interface_up(interface):
:returns: boolean :returns: boolean
""" """
if sys.platform.startswith("linux"): if sys.platform.startswith("linux") or sys.platform.startswith("openbsd"):
if interface not in psutil.net_if_addrs(): if interface not in psutil.net_if_addrs():
return False return False
@ -283,6 +283,7 @@ def interfaces():
"vmware", "vmware",
"virtualbox", "virtualbox",
"gns3", "gns3",
"veb"
): ):
if result["name"].lower().startswith(special_interface): if result["name"].lower().startswith(special_interface):
result["special"] = True result["special"] = True