From 012cc4bf7e20d7a60191c1221a39d99046363cec Mon Sep 17 00:00:00 2001 From: Philip Hands Date: Fri, 10 Jun 2016 09:18:18 +0200 Subject: lvc: job-specific net name, and don't hardwire UUID --- cucumber/features/support/helpers/vm_helper.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'cucumber/features/support/helpers/vm_helper.rb') diff --git a/cucumber/features/support/helpers/vm_helper.rb b/cucumber/features/support/helpers/vm_helper.rb index 3f172136..dd8ce936 100644 --- a/cucumber/features/support/helpers/vm_helper.rb +++ b/cucumber/features/support/helpers/vm_helper.rb @@ -15,8 +15,15 @@ class VMNet rexml = REXML::Document.new(net_xml) rexml.elements['network'].add_element('name') rexml.elements['network/name'].text = @net_name - rexml.elements['network'].add_element('uuid') - rexml.elements['network/uuid'].text = LIBVIRT_NETWORK_UUID + # PGH + begin + old_net = @virt.lookup_network_by_name(@net_name) + rexml.elements['network'].add_element('uuid') + rexml.elements['network/uuid'].text = old_net.uuid + old_net.undefine + rescue + end + update(rexml.to_s) update(rexml.to_s) rescue Exception => e destroy_and_undefine -- cgit v1.2.3-70-g09d2