Address #4573 Check interface keys and return gracefully on solaris zones

This commit is contained in:
James Tanner 2013-11-06 18:11:22 -05:00
parent 31b5b66eb1
commit ce29c158a9

View file

@ -1732,6 +1732,8 @@ class GenericBsdIfconfigNetwork(Network):
def merge_default_interface(self, defaults, interfaces, ip_type): def merge_default_interface(self, defaults, interfaces, ip_type):
if not 'interface' in defaults.keys(): if not 'interface' in defaults.keys():
return return
if not defaults['interface'] in interfaces:
return
ifinfo = interfaces[defaults['interface']] ifinfo = interfaces[defaults['interface']]
# copy all the interface values across except addresses # copy all the interface values across except addresses
for item in ifinfo.keys(): for item in ifinfo.keys():