Restore the veth- prefix for docker otherwise it's conflict with network

manager

See #593, #440
This commit is contained in:
Julien Duponchelle committed 2016-06-27 12:09:46 +02:00
1 parent 379c216109
commit fa769cd41d
2 files changed
+10 -10

No files matched your search

+3 -3
View File
@@ -623,10 +623,10 @@ class DockerVM(BaseVM):
"Adapter {adapter_number} doesn't exist on Docker container '{name}'".format(name=self.name, adapter_number=adapter_number))
for index in range(4096):
if "gns3-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.host_ifc = "gns3-ext{}".format(str(index))
adapter.guest_ifc = "gns3-int{}".format(str(index))
adapter.host_ifc = "veth-gns3-ext{}".format(str(index))
adapter.guest_ifc = "veth-gns3-int{}".format(str(index))
break
if not hasattr(adapter, "ifc"):
raise DockerError(