From 6cd0ccf0ad4d31e6dbf354065a6d6d308822238b Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 22 Jun 2021 02:21:55 -0400 Subject: [PATCH] Fix network check on VM config modification --- daemon-common/vm.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/daemon-common/vm.py b/daemon-common/vm.py index aaba3758..a8585799 100644 --- a/daemon-common/vm.py +++ b/daemon-common/vm.py @@ -291,9 +291,18 @@ def modify_vm(zkhandler, domain, restart, new_vm_config): except Exception: return False, 'ERROR: Failed to parse new XML data.' + # Get our old network list for comparison purposes + old_vm_config = zkhandler.read(('domain.xml', dom_uuid)) + old_parsed_xml = lxml.objectify.fromstring(old_vm_config) + old_dnetworks = common.getDomainNetworks(old_parsed_xml, {}) + # If a SR-IOV network device is being added, set its used state dnetworks = common.getDomainNetworks(parsed_xml, {}) for network in dnetworks: + # Ignore networks that are already there + if network in old_dnetworks: + continue + if network['type'] in ['direct', 'hostdev']: dom_node = zkhandler.read(('domain.node', dom_uuid)) @@ -307,12 +316,6 @@ def modify_vm(zkhandler, domain, restart, new_vm_config): set_sriov_vf_vm(zkhandler, dom_uuid, dom_node, network['source'], network['mac'], network['type']) # If a SR-IOV network device is being removed, unset its used state - old_vm_config = zkhandler.read(('domain.xml', dom_uuid)) - try: - old_parsed_xml = lxml.objectify.fromstring(old_vm_config) - except Exception: - return False, 'ERROR: Failed to parse old XML data.' - old_dnetworks = common.getDomainNetworks(old_parsed_xml, {}) for network in old_dnetworks: if network['type'] in ['direct', 'hostdev']: if network['mac'] not in [n['mac'] for n in dnetworks]: