state: Assume that the IPv{4,6} subtrees are present

Signed-off-by: Edward Haas <edwardh@redhat.com>
This commit is contained in:
Edward Haas 2019-05-05 19:47:52 +03:00
parent 9143fd916c
commit f22a3b95e2

View File

@ -117,7 +117,7 @@ class State(object):
"""
for iface_state in six.viewvalues(self.interfaces):
for family in ('ipv4', 'ipv6'):
ip = iface_state.get(family, {})
ip = iface_state[family]
if ip.get('enabled') and (
ip.get('dhcp') or ip.get('autoconf')):
ip['address'] = []
@ -226,8 +226,7 @@ class State(object):
def _sort_ip_addresses(self):
for ifstate in six.viewvalues(self.interfaces):
for family in ('ipv4', 'ipv6'):
ifstate.get(family, {}).get('address', []).sort(
key=itemgetter('ip'))
ifstate[family].get('address', []).sort(key=itemgetter('ip'))
def _capitalize_mac(self):
for ifstate in six.viewvalues(self.interfaces):