Merge branch '1.5' into 2.0

This commit is contained in:
Julien Duponchelle committed 2016-06-27 14:24:48 +02:00
commit c0b09ae76a
5 files changed
+27 -8

No files matched your search

+1
View File
@@ -24,6 +24,7 @@ import asyncio
import logging
import aiohttp
import json
import sys
from gns3server.utils import parse_version
log = logging.getLogger(__name__)
+1 -1
View File
@@ -623,7 +623,7 @@ class DockerVM(BaseNode):
raise DockerError("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(4096):
if "veth-gns3-ext{}".format(index) not in psutil.net_if_addrs():
adapter.ifc = "eth{}".format(str(index))
adapter.host_ifc = "veth-gns3-ext{}".format(str(index))