parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 112 Wiki Activity

Better handle missing elements from net config 

Prevents situations with an un-editable, invalid config being stuck.
This commit is contained in:
Joshua Boniface 2020-08-21 10:27:45 -04:00
parent 1967034493
commit e4891831ce
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
daemon-common/common.py
View File

@ -310,12 +310,24 @@ def getDomainNetworks(parsed_xml, stats_data):
dnets = []
for device in parsed_xml.devices.getchildren():
if device.tag == 'interface':
net_type = device.attrib.get('type')
net_mac = device.mac.attrib.get('address')
net_bridge = device.source.attrib.get(net_type)
net_model = device.model.attrib.get('type')
net_stats_list = [x for x in stats_data.get('net_stats', []) if x.get('bridge') == net_bridge]
try:
net_type = device.attrib.get('type')
except:
net_type = None
try:
net_mac = device.mac.attrib.get('address')
except:
net_mac = None
try:
net_bridge = device.source.attrib.get(net_type)
except:
net_bridge = None
try:
net_model = device.model.attrib.get('type')
except:
net_model = None
try:
net_stats_list = [x for x in stats_data.get('net_stats', []) if x.get('bridge') == net_bridge]
net_stats = net_stats_list[0]
except:
net_stats = {}