From 27c697a62d3e180f81751b854d1f8d573f5260e8 Mon Sep 17 00:00:00 2001 From: Philip Hands Date: Thu, 16 Jun 2016 20:42:25 +0200 Subject: lvc: name the storage after the VM, to avoid conflicts perhaps it would be better to prefix volume names in a common pool so we could try that at some point Signed-off-by: Holger Levsen --- cucumber/features/domains/storage_pool.xml | 2 +- cucumber/features/support/helpers/storage_helper.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cucumber/features/domains/storage_pool.xml b/cucumber/features/domains/storage_pool.xml index ce0a6915..1e0d6bb3 100644 --- a/cucumber/features/domains/storage_pool.xml +++ b/cucumber/features/domains/storage_pool.xml @@ -1,5 +1,5 @@ - DebianToasterStorage + diff --git a/cucumber/features/support/helpers/storage_helper.rb b/cucumber/features/support/helpers/storage_helper.rb index 21537a92..b1f316c6 100644 --- a/cucumber/features/support/helpers/storage_helper.rb +++ b/cucumber/features/support/helpers/storage_helper.rb @@ -17,7 +17,8 @@ class VMStorage @virt = virt @xml_path = xml_path pool_xml = REXML::Document.new(File.read("#{@xml_path}/storage_pool.xml")) - pool_name = pool_xml.elements['pool/name'].text + pool_name = LIBVIRT_DOMAIN_NAME + pool_xml.elements['pool/name'].text = pool_name @pool_path = "#{$config["TMPDIR"]}/#{pool_name}" begin @pool = @virt.lookup_storage_pool_by_name(pool_name) -- cgit v1.2.3-70-g09d2