From 985b51d7a308ce468105b2c38a293e9f4bd1f48e Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Wed, 26 May 2021 11:32:54 +0200 Subject: [qemu] Add unit tests for Libvirt configuration transformations --- .../qemu/configuration/TransformationGenericFileSystemDevices.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericFileSystemDevices.java') diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericFileSystemDevices.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericFileSystemDevices.java index 88939302..a4f77b0d 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericFileSystemDevices.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericFileSystemDevices.java @@ -66,7 +66,7 @@ public class TransformationGenericFileSystemDevices extends TransformationGeneri if ( fileSystem == null ) { // check if file system device source directory is specified - if ( source != null && target != null ) { + if ( source != null && !source.isEmpty() && target != null && !target.isEmpty() ) { // file system device does not exist, so create new file system device final FileSystem newFileSystem = config.addFileSystemDevice(); newFileSystem.setType( Type.MOUNT ); @@ -75,7 +75,7 @@ public class TransformationGenericFileSystemDevices extends TransformationGeneri newFileSystem.setTarget( target ); } } else { - if ( source == null || target == null ) { + if ( source == null || source.isEmpty() || target == null || target.isEmpty() ) { // remove file system device since device source or target is not specified fileSystem.remove(); } else { @@ -100,7 +100,7 @@ public class TransformationGenericFileSystemDevices extends TransformationGeneri // remove all additional file system devices final ArrayList devices = config.getFileSystemDevices(); - for ( int i = 1; i < devices.size(); i++ ) { + for ( int i = 2; i < devices.size(); i++ ) { devices.get( i ).remove(); } } -- cgit v1.2.3-55-g7522