From ce3a015f2353e86f3303baac6ccc05bcc7923f20 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 2 Feb 2015 17:50:16 -0500 Subject: [PATCH] Don't add a broadcast address for v6 addresses. --- akanda/router/drivers/ip.py | 2 +- test/unit/drivers/test_ip.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/akanda/router/drivers/ip.py b/akanda/router/drivers/ip.py index f900382..9bc2c38 100644 --- a/akanda/router/drivers/ip.py +++ b/akanda/router/drivers/ip.py @@ -196,7 +196,7 @@ class IPManager(base.Manager): """ family = {4: 'inet', 6: 'inet6'}[address[0].version] args = ['addr', cmd, '%s/%s' % (address[0], address[1])] - if cmd == 'add': + if family == 'inet' and cmd == 'add': args += ['brd', '+'] args += ['dev', real_ifname] if family == 'inet6': diff --git a/test/unit/drivers/test_ip.py b/test/unit/drivers/test_ip.py index 6827c94..12c3e1c 100644 --- a/test/unit/drivers/test_ip.py +++ b/test/unit/drivers/test_ip.py @@ -261,8 +261,7 @@ class IPTestCase(TestCase): mock.call([cmd, 'addr', 'show', 'em0']), mock.call([ cmd, '-6', 'addr', 'add', - 'fdca:3ba5:a17a:acda:20c:29ff:fe94:723d/64', 'brd', '+', - 'dev', 'em0' + 'fdca:3ba5:a17a:acda:20c:29ff:fe94:723d/64', 'dev', 'em0' ], 'sudo'), mock.call([cmd, 'link', 'set', 'em0', 'up'], 'sudo'), mock.call([cmd, 'addr', 'show', 'em0']) @@ -367,8 +366,7 @@ class IPTestCase(TestCase): mock.call([cmd, 'link', 'set', 'eth0', 'up'], 'sudo'), mock.call([ cmd, '-6', 'addr', 'add', - 'fdca:3ba5:a17a:acda:f816:3eff:fe34:ba28/64', 'brd', '+', - 'dev', 'eth0' + 'fdca:3ba5:a17a:acda:f816:3eff:fe34:ba28/64', 'dev', 'eth0' ], 'sudo'), mock.call([cmd, 'link', 'set', 'eth0', 'up'], 'sudo') ]