opendev
/
glean
Code Issues Proposed changes

Do not fail if routes are missing from a network 

Routes are optional in the schema, let's not treat them as required.

Change-Id: Id3130634fa61ff2e3bd7483ba4b5452dca4de909
This commit is contained in:
Dmitry Tantsur 2020-11-11 13:49:37 +01:00
parent a507b71117
commit 75d81fd342
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glean/cmd.py
View File

@ -202,7 +202,7 @@ def _write_rh_interface(name, interface, args):
# the return value, not append it
results = _set_rh_bonding(name, interface, distro, results)
routes = []
for route in interface['routes']:
for route in interface.get('routes', ()):
if route['network'] == '0.0.0.0' and route['netmask'] == '0.0.0.0':
if not _is_suse(distro):
results += "DEFROUTE=yes\n"
@ -657,7 +657,7 @@ mac_{name}="{hwaddr}\"\n""".format(
hwaddr=interface['mac_address']
)
routes = list()
for route in interface['routes']:
for route in interface.get('routes', ()):
if (route['network'] == '0.0.0.0' and
route['netmask'] == '0.0.0.0'):
# add default route if it exists
@ -890,7 +890,7 @@ def write_debian_interfaces(interfaces, sys_interfaces):
result += " netmask {0}\n".format(
utils.ipv6_netmask_length(interface['netmask']))
for route in interface['routes']:
for route in interface.get('routes', ()):
if ((route['network'] == '0.0.0.0' and
route['netmask'] == '0.0.0.0') or
(route['network'] == '::' and