openstack/neutron
Code Issues Proposed changes

Merge "ipv6: set OtherConfig flag for DHCPv6 stateless subnets"

Browse Source
This commit is contained in:
Jenkins 2014-12-22 14:48:37 +00:00 committed by Gerrit Code Review
commit c37830ecc2
2 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import jinja2
import netaddr import netaddr
from oslo.config import cfg from oslo.config import cfg
import six import six
@ -33,31 +34,25 @@ OPTS = [
cfg.CONF.register_opts(OPTS) cfg.CONF.register_opts(OPTS)
prefix_fmt = """interface %s CONFIG_TEMPLATE = jinja2.Template("""interface {{ interface_name }}
{ {
AdvSendAdvert on; AdvSendAdvert on;
MinRtrAdvInterval 3; MinRtrAdvInterval 3;
MaxRtrAdvInterval 10; MaxRtrAdvInterval 10;
prefix %s
{% if ra_mode == constants.DHCPV6_STATELESS %}
AdvOtherConfigFlag on;
{% endif %}
{% if ra_mode in (constants.IPV6_SLAAC, constants.DHCPV6_STATELESS) %}
prefix {{ prefix }}
{ {
AdvOnLink on; AdvOnLink on;
AdvAutonomous on; AdvAutonomous on;
}; };
{% endif %}
}; };
""" """)
default_fmt = """interface %s
{
AdvSendAdvert on;
MinRtrAdvInterval 3;
MaxRtrAdvInterval 10;
};
"""
def _is_slaac(ra_mode):
return (ra_mode == constants.IPV6_SLAAC or
ra_mode == constants.DHCPV6_STATELESS)
def _generate_radvd_conf(router_id, router_ports, dev_name_helper): def _generate_radvd_conf(router_id, router_ports, dev_name_helper):
@ -67,14 +62,15 @@ def _generate_radvd_conf(router_id, router_ports, dev_name_helper):
True) True)
buf = six.StringIO() buf = six.StringIO()
for p in router_ports: for p in router_ports:
if netaddr.IPNetwork(p['subnet']['cidr']).version == 6: prefix = p['subnet']['cidr']
if netaddr.IPNetwork(prefix).version == 6:
interface_name = dev_name_helper(p['id']) interface_name = dev_name_helper(p['id'])
if _is_slaac(p['subnet']['ipv6_ra_mode']): ra_mode = p['subnet']['ipv6_ra_mode']
conf_str = prefix_fmt % (interface_name, buf.write('%s' % CONFIG_TEMPLATE.render(
p['subnet']['cidr']) ra_mode=ra_mode,
else: interface_name=interface_name,
conf_str = default_fmt % interface_name prefix=prefix,
buf.write('%s' % conf_str) constants=constants))
utils.replace_file(radvd_conf, buf.getvalue()) utils.replace_file(radvd_conf, buf.getvalue())
return radvd_conf return radvd_conf

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

@ -2195,6 +2195,24 @@ vrrp_instance VR_1 {
self.assertIn(_join('-p', pidfile), cmd) self.assertIn(_join('-p', pidfile), cmd)
self.assertIn(_join('-m', 'syslog'), cmd) self.assertIn(_join('-m', 'syslog'), cmd)
def test_generate_radvd_conf_other_flag(self):
# 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}
for ra_mode, flag_set in expected.iteritems():
router = prepare_router_data()
ri = self._process_router_ipv6_interface_added(router,
ra_mode=ra_mode)
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])
class TestL3AgentEventHandler(base.BaseTestCase): class TestL3AgentEventHandler(base.BaseTestCase):