diff options
author | Manuel Bentele | 2021-04-30 10:22:59 +0200 |
---|---|---|
committer | Manuel Bentele | 2021-04-30 10:22:59 +0200 |
commit | 110afb975a086cd059b695763655bcdf5f151e1e (patch) | |
tree | 7e2ff12bd635afcffff7eb3ed8b80c4aa513b99b /src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java | |
parent | Add unit tests for transformation logic (dozmod-server --> dozmod-client) (diff) | |
download | master-sync-shared-110afb975a086cd059b695763655bcdf5f151e1e.tar.gz master-sync-shared-110afb975a086cd059b695763655bcdf5f151e1e.tar.xz master-sync-shared-110afb975a086cd059b695763655bcdf5f151e1e.zip |
Add unit tests for transformation logic (dozmod-server --> stateless client)
Diffstat (limited to 'src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java')
-rw-r--r-- | src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java index 716a2f3..710a42d 100644 --- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java +++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java @@ -313,6 +313,12 @@ public class VirtualizationConfigurationQemu extends } @Override + public boolean addEmptyHddTemplate() + { + return this.addHddTemplate( new String(), null, null ); + } + + @Override public boolean addHddTemplate( File diskImage, String hddMode, String redoDir ) { return this.addHddTemplate( diskImage.getAbsolutePath(), hddMode, redoDir ); @@ -348,13 +354,22 @@ public class VirtualizationConfigurationQemu extends storageDiskDevice.setBusType( BusType.VIRTIO ); String targetDevName = VirtualizationConfigurationQemuUtils.createAlphabeticalDeviceName( "vd", index ); storageDiskDevice.setTargetDevice( targetDevName ); - storageDiskDevice.setStorage( StorageType.FILE, diskImagePath ); + + if ( diskImagePath == null || diskImagePath.isEmpty() ) { + storageDiskDevice.removeStorage(); + } else { + storageDiskDevice.setStorage( StorageType.FILE, diskImagePath ); + } // add new created HDD to the metadata of the QemuMetaData object, too this.addHddMetaData( storageDiskDevice ); } else { // HDD exists, so update existing storage (HDD) device - storageDiskDevice.setStorage( StorageType.FILE, diskImagePath ); + if ( diskImagePath == null || diskImagePath.isEmpty() ) { + storageDiskDevice.removeStorage(); + } else { + storageDiskDevice.setStorage( StorageType.FILE, diskImagePath ); + } } return true; |