diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-10-28 08:46:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-10-28 08:46:42 +0000 |
| commit | 4ea2a41464237deabff29bd29a9ffb621ac9f7af (patch) | |
| tree | bd9c08526dbffd71641f02169b7688c0c3af629b | |
| parent | ed1aa266cef795e383cc9a7ee77f860eaca8b7fe (diff) | |
| parent | bb19cc76e5d7b045dc75a0e38ad2ca1b0875b142 (diff) | |
| download | extras-4ea2a41464237deabff29bd29a9ffb621ac9f7af.tar.gz | |
Merge "Set accept_ra to 2 on all interfaces."
| -rw-r--r-- | tests/net_test/multinetwork_base.py | 9 | ||||
| -rwxr-xr-x | tests/net_test/multinetwork_test.py | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/net_test/multinetwork_base.py b/tests/net_test/multinetwork_base.py index 1e00f74d..2282bbab 100644 --- a/tests/net_test/multinetwork_base.py +++ b/tests/net_test/multinetwork_base.py @@ -220,6 +220,8 @@ class MultiNetworkBaseTest(net_test.NetworkTest): net_test.SetInterfaceHWAddr(iface, cls.MyMacAddress(netid)) # Disable DAD so we don't have to wait for it. cls.SetSysctl("/proc/sys/net/ipv6/conf/%s/accept_dad" % iface, 0) + # Set accept_ra to 2, because that's what we use. + cls.SetSysctl("/proc/sys/net/ipv6/conf/%s/accept_ra" % iface, 2) net_test.SetInterfaceUp(iface) net_test.SetNonBlocking(f) return f @@ -326,6 +328,13 @@ class MultiNetworkBaseTest(net_test.NetworkTest): open(sysctl, "w").write(str(value) + "\n") @classmethod + def SetIPv6SysctlOnAllIfaces(cls, sysctl, value): + for netid in cls.tuns: + iface = cls.GetInterfaceName(netid) + name = "/proc/sys/net/ipv6/conf/%s/%s" % (iface, sysctl) + cls.SetSysctl(name, value) + + @classmethod def _RestoreSysctls(cls): for sysctl, value in cls.saved_sysctls.iteritems(): try: diff --git a/tests/net_test/multinetwork_test.py b/tests/net_test/multinetwork_test.py index a31c5f01..de6b4f21 100755 --- a/tests/net_test/multinetwork_test.py +++ b/tests/net_test/multinetwork_test.py @@ -595,6 +595,7 @@ class RATest(multinetwork_base.MultiNetworkBaseTest): try: CheckIPv6Connectivity(True) + self.SetIPv6SysctlOnAllIfaces("accept_ra", 1) self.SetSysctl("/proc/sys/net/ipv6/conf/all/forwarding", 1) CheckIPv6Connectivity(False) finally: |