ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-03 03:26:41 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Change the name of veth to avoid bugs :(

Browse Source 
Fun stuff the name create different behavior with
network manager.

Ref #440
This commit is contained in:
Julien Duponchelle 2016-03-01 15:33:30 +01:00
parent 7469f65fa0
commit 59c1e125d3
No known key found for this signature in database
GPG Key ID: F1E2485547D4595D
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/modules/docker/docker_vm.py
View File

@ -454,10 +454,10 @@ class DockerVM(BaseVM):
"Adapter {adapter_number} doesn't exist on Docker container '{name}'".format(name=self.name, adapter_number=adapter_number)) "Adapter {adapter_number} doesn't exist on Docker container '{name}'".format(name=self.name, adapter_number=adapter_number))
for index in range(128): for index in range(128):
if "gns3-veth{}ext".format(index) not in psutil.net_if_addrs(): if "veth-gns3-ext{}".format(index) not in psutil.net_if_addrs():
adapter.ifc = "eth{}".format(str(index)) adapter.ifc = "eth{}".format(str(index))
adapter.host_ifc = "gns3-veth{}ext".format(str(index)) adapter.host_ifc = "veth-gns3-ext{}".format(str(index))
adapter.guest_ifc = "gns3-veth{}int".format(str(index)) adapter.guest_ifc = "veth-gns3-int{}".format(str(index))
break break
if not hasattr(adapter, "ifc"): if not hasattr(adapter, "ifc"):
raise DockerError( raise DockerError(

14
tests/modules/docker/test_docker_vm.py
View File

@ -554,10 +554,10 @@ def test_add_ubridge_connection(loop, vm):
loop.run_until_complete(asyncio.async(vm._add_ubridge_connection(nio, 0, 42))) loop.run_until_complete(asyncio.async(vm._add_ubridge_connection(nio, 0, 42)))
calls = [ calls = [
call.send("docker create_veth gns3-veth0ext gns3-veth0int"), call.send("docker create_veth veth-gns3-ext0 veth-gns3-int0"),
call.send('docker move_to_ns gns3-veth0int 42 eth0'), call.send('docker move_to_ns veth-gns3-int0 42 eth0'),
call.send('bridge create bridge0'), call.send('bridge create bridge0'),
call.send('bridge add_nio_linux_raw bridge0 gns3-veth0ext'), call.send('bridge add_nio_linux_raw bridge0 veth-gns3-ext0'),
call.send('bridge add_nio_udp bridge0 4242 127.0.0.1 4343'), call.send('bridge add_nio_udp bridge0 4242 127.0.0.1 4343'),
call.send('bridge start_capture bridge0 "/tmp/capture.pcap"'), call.send('bridge start_capture bridge0 "/tmp/capture.pcap"'),
call.send('bridge start bridge0') call.send('bridge start bridge0')
@ -574,8 +574,8 @@ def test_add_ubridge_connection_none_nio(loop, vm):
loop.run_until_complete(asyncio.async(vm._add_ubridge_connection(nio, 0, 42))) loop.run_until_complete(asyncio.async(vm._add_ubridge_connection(nio, 0, 42)))
calls = [ calls = [
call.send("docker create_veth gns3-veth0ext gns3-veth0int"), call.send("docker create_veth veth-gns3-ext0 veth-gns3-int0"),
call.send('docker move_to_ns gns3-veth0int 42 eth0'), call.send('docker move_to_ns veth-gns3-int0 42 eth0'),
] ]
# We need to check any_order ortherwise mock is confused by asyncio # We need to check any_order ortherwise mock is confused by asyncio
vm._ubridge_hypervisor.assert_has_calls(calls, any_order=True) vm._ubridge_hypervisor.assert_has_calls(calls, any_order=True)
@ -602,7 +602,7 @@ def test_add_ubridge_connection_no_free_interface(loop, vm):
with pytest.raises(DockerError): with pytest.raises(DockerError):
# We create fake ethernet interfaces for docker # We create fake ethernet interfaces for docker
interfaces = ["gns3-veth{}ext".format(index) for index in range(128)] interfaces = ["veth-gns3-ext{}".format(index) for index in range(128)]
with patch("psutil.net_if_addrs", return_value=interfaces): with patch("psutil.net_if_addrs", return_value=interfaces):
loop.run_until_complete(asyncio.async(vm._add_ubridge_connection(nio, 0, 42))) loop.run_until_complete(asyncio.async(vm._add_ubridge_connection(nio, 0, 42)))
@ -622,7 +622,7 @@ def test_delete_ubridge_connection(loop, vm):
calls = [ calls = [
call.send("bridge delete bridge0"), call.send("bridge delete bridge0"),
call.send('docker delete_veth gns3-veth0ext') call.send('docker delete_veth veth-gns3-ext0')
] ]
vm._ubridge_hypervisor.assert_has_calls(calls, any_order=True) vm._ubridge_hypervisor.assert_has_calls(calls, any_order=True)