openstack
/
neutron
Code Issues Proposed changes

Configures RADVD to send managed flag in RA 

for DHCP_STATEFUL

RADVD process is configured so that it sends
managed flag in RA for the subnets with
ra_mode set to DHCP_STATEFUL. UT case is
updated to check the presence of managed
flag in config file of RADVD for
DHCP_STATEFUL.

Change-Id: If685846c0c0f67bf4c40f4f268b9d03bfa2b1654
Closes-Bug: #1377843
(cherry picked from commit 1f337c761b)
This commit is contained in:
singhannie 2014-12-31 03:47:38 -08:00 committed by Ihar Hrachyshka
parent 7694ba7b72
commit 3f73028a1e
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/agent/linux/ra.py
View File

@ -44,6 +44,10 @@ CONFIG_TEMPLATE = jinja2.Template("""interface {{ interface_name }}
AdvOtherConfigFlag on;
{% endif %}
{% if ra_mode == constants.DHCPV6_STATEFUL %}
AdvManagedFlag on;
{% endif %}
{% if ra_mode in (constants.IPV6_SLAAC, constants.DHCPV6_STATELESS) %}
prefix {{ prefix }}
{

27
neutron/tests/unit/test_l3_agent.py
View File

@ -2345,13 +2345,17 @@ class TestBasicRouterOperations(base.BaseTestCase):
self.assertIn(_join('-p', pidfile), cmd)
self.assertIn(_join('-m', 'syslog'), cmd)
def test_generate_radvd_conf_other_flag(self):
def test_generate_radvd_conf_other_and_managed_flag(self):
_skip_check = object()
skip = lambda flag: True if flag is _skip_check else False
expected = {l3_constants.IPV6_SLAAC: (False, False),
l3_constants.DHCPV6_STATELESS: (True, False),
# we don't check other flag for stateful since it's redundant
# for this mode and can be ignored by clients, as per RFC4861
expected = {l3_constants.IPV6_SLAAC: False,
l3_constants.DHCPV6_STATELESS: True}
l3_constants.DHCPV6_STATEFUL: (_skip_check, True)}
for ra_mode, flag_set in expected.iteritems():
for ra_mode, flags_set in expected.iteritems():
router = prepare_router_data()
ri = self._process_router_ipv6_interface_added(router,
ra_mode=ra_mode)
@ -2359,9 +2363,18 @@ class TestBasicRouterOperations(base.BaseTestCase):
ra._generate_radvd_conf(ri.router['id'],
router[l3_constants.INTERFACE_KEY],
mock.Mock())
asserter = self.assertIn if flag_set else self.assertNotIn
asserter('AdvOtherConfigFlag on;',
self.utils_replace_file.call_args[0][1])
def assertFlag(flag):
return (self.assertIn if flag else self.assertNotIn)
other_flag, managed_flag = flags_set
if not skip(other_flag):
assertFlag(other_flag)('AdvOtherConfigFlag on;',
self.utils_replace_file.call_args[0][1])
if not skip(managed_flag):
assertFlag(managed_flag)('AdvManagedFlag on',
self.utils_replace_file.call_args[0][1])
class TestL3AgentEventHandler(base.BaseTestCase):