openstack
/
neutron
Code Issues Proposed changes

Merge "Configures RADVD to send managed flag in RA for DHCP_STATEFUL"

This commit is contained in:
Jenkins 2015-02-04 00:23:51 +00:00 committed by Gerrit Code Review
parent 94965f7394 1f337c761b
commit e18f0cb003
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

@ -46,6 +46,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

@ -2057,13 +2057,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)
@ -2071,9 +2075,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])
def test__put_fips_in_error_state(self):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)