ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-21 05:43:12 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Try to fix VPCS and loobpack adapters not working together. Ref #771.

Browse Source
This commit is contained in:
grossmj 2016-11-15 17:36:51 +11:00
parent 5166d894eb
commit 3c384a7bf0
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/compute/base_node.py
View File

@ -603,7 +603,7 @@ class BaseNode:
yield from self._ubridge_send('bridge add_nio_ethernet {name} "{interface}"'.format(name=bridge_name, yield from self._ubridge_send('bridge add_nio_ethernet {name} "{interface}"'.format(name=bridge_name,
interface=npf_id)) interface=npf_id))
else: else:
raise NodeError("Could not find NPF id for VMnet interface {}".format(ethernet_interface)) raise NodeError("Could not find NPF id for interface {}".format(ethernet_interface))
if block_host_traffic: if block_host_traffic:
if source_mac: if source_mac:

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

@ -188,16 +188,7 @@ class Cloud(BaseNode):
if port_info["type"] in ("ethernet", "tap"): if port_info["type"] in ("ethernet", "tap"):
if sys.platform.startswith("win"): if sys.platform.startswith("win"):
windows_interfaces = self._interfaces() yield from self._add_ubridge_ethernet_connection(bridge_name, port_info["interface"])
npf = None
for interface in windows_interfaces:
if port_info["interface"] == interface["name"]:
npf = interface["id"]
if npf:
yield from self._ubridge_send('bridge add_nio_ethernet {name} "{interface}"'.format(name=bridge_name,
interface=npf))
else:
raise NodeError("Could not find NPF id for interface {}".format(port_info["interface"]))
else: else: