openstack/deb-ryu
Code Issues Proposed changes

docker_base.py: fix an ip option of "docker network connect"

Browse Source 
ip address with subnet is ignored in ip option of "docker network connect"
This patch specifies a correct ip format for option.

Signed-off-by: Fumihiko Kakuma <kakuma@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
fumihiko kakuma
2017-01-17 08:06:33 +09:00
committed by FUJITA Tomonori
parent 17e2e51924
commit e9099345d2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ryu/tests/integrated/common/docker_base.py
View File

@@ -374,14 +374,15 @@ class Bridge(object):
ipv4 = None
ipv6 = None
ip_address = self.next_ip_address()
ip_address_ip = ip_address.split('/')[0]
version = 4
if netaddr.IPNetwork(ip_address).version == 6:
version = 6
opt_ip = "--ip %s" % ip_address
opt_ip = "--ip %s" % ip_address_ip
if version == 4:
ipv4 = ip_address
else:
opt_ip = "--ip6 %s" % ip_address
opt_ip = "--ip6 %s" % ip_address_ip
ipv6 = ip_address
cmd = "docker network connect %s %s %s" % (
opt_ip, self.name, ctn.docker_name())