openstack/os-net-config
Code Issues Proposed changes

Merge "If setting a default route, use default netmask"

Browse Source
This commit is contained in:
Jenkins
2014-12-16 17:15:52 +00:00
committed by Gerrit Code Review
parent 36d24771ea 35faddb8cd
commit 2c589f4b51
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
os_net_config/impl_eni.py
View File

@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*- # -*- Coding: utf-8 -*-
# Copyright 2014 Red Hat, Inc. # Copyright 2014 Red Hat, Inc.
# #
@@ -174,7 +174,10 @@ class ENINetConfig(os_net_config.NetConfig):
logger.info('adding custom route for interface: %s' % interface_name) logger.info('adding custom route for interface: %s' % interface_name)
data = "" data = ""
for route in routes: for route in routes:
rt = netaddr.IPNetwork(route.ip_netmask) if route.default and not route.ip_netmask:
rt = netaddr.IPNetwork("0.0.0.0/0")
else:
rt = netaddr.IPNetwork(route.ip_netmask)
data += "up route add -net %s netmask %s gw %s\n" % ( data += "up route add -net %s netmask %s gw %s\n" % (
str(rt.ip), str(rt.netmask), route.next_hop) str(rt.ip), str(rt.netmask), route.next_hop)
data += "down route del -net %s netmask %s gw %s\n" % ( data += "down route del -net %s netmask %s gw %s\n" % (