diff options
author | Manuel Bentele | 2021-04-16 14:11:48 +0200 |
---|---|---|
committer | Manuel Bentele | 2021-04-16 14:11:48 +0200 |
commit | 3d6e9c8081e1187b6e9960fd75839992e1890b38 (patch) | |
tree | c6b718c93afc9bc6af1c5dbe05b4b7c8b3ccfc64 | |
parent | [qemu] Move generic filtering/transformation to master-sync-shared (diff) | |
download | mltk-3d6e9c8081e1187b6e9960fd75839992e1890b38.tar.gz mltk-3d6e9c8081e1187b6e9960fd75839992e1890b38.tar.xz mltk-3d6e9c8081e1187b6e9960fd75839992e1890b38.zip |
[qemu] Rename VmMetaData classes
7 files changed, 16 insertions, 16 deletions
diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskCdromDevices.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskCdromDevices.java index 860e0f1e..345dd5a9 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskCdromDevices.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskCdromDevices.java @@ -6,8 +6,8 @@ import org.openslx.libvirt.domain.Domain; import org.openslx.libvirt.domain.device.Disk.StorageType; import org.openslx.libvirt.domain.device.DiskCdrom; import org.openslx.runvirt.plugin.qemu.cmdln.CommandLineArgs; -import org.openslx.virtualization.configuration.machine.QemuMetaData; -import org.openslx.virtualization.configuration.machine.QemuMetaDataUtils; +import org.openslx.virtualization.configuration.VirtualizationConfigurationQemu; +import org.openslx.virtualization.configuration.VirtualizationConfigurationQemuUtils; import org.openslx.virtualization.configuration.transformation.TransformationException; import org.openslx.virtualization.configuration.transformation.TransformationGeneric; @@ -23,12 +23,12 @@ public class TransformationGenericDiskCdromDevices extends TransformationGeneric private void filterDiskCdromDevice( Domain config, String fileName, int index ) throws TransformationException { final ArrayList<DiskCdrom> devices = config.getDiskCdromDevices(); - final DiskCdrom disk = QemuMetaDataUtils.getArrayIndex( devices, index ); + final DiskCdrom disk = VirtualizationConfigurationQemuUtils.getArrayIndex( devices, index ); if ( disk != null ) { if ( fileName == null ) { // do not remove disk CDROM drive, but set local physical drive as input source - disk.setStorage( StorageType.BLOCK, QemuMetaData.CDROM_DEFAULT_PHYSICAL_DRIVE ); + disk.setStorage( StorageType.BLOCK, VirtualizationConfigurationQemu.CDROM_DEFAULT_PHYSICAL_DRIVE ); } else if ( fileName.equals( "" ) ) { // remove storage source if empty string is specified to emulate an empty CDROM drive disk.removeStorage(); diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskFloppyDevices.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskFloppyDevices.java index 7386a0b5..6ceae846 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskFloppyDevices.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskFloppyDevices.java @@ -6,7 +6,7 @@ import org.openslx.libvirt.domain.Domain; import org.openslx.libvirt.domain.device.Disk.StorageType; import org.openslx.libvirt.domain.device.DiskFloppy; import org.openslx.runvirt.plugin.qemu.cmdln.CommandLineArgs; -import org.openslx.virtualization.configuration.machine.QemuMetaDataUtils; +import org.openslx.virtualization.configuration.VirtualizationConfigurationQemuUtils; import org.openslx.virtualization.configuration.transformation.TransformationException; import org.openslx.virtualization.configuration.transformation.TransformationGeneric; @@ -22,7 +22,7 @@ public class TransformationGenericDiskFloppyDevices extends TransformationGeneri private void filterDiskFloppyDevice( Domain config, String fileName, int index ) throws TransformationException { final ArrayList<DiskFloppy> devices = config.getDiskFloppyDevices(); - final DiskFloppy disk = QemuMetaDataUtils.getArrayIndex( devices, index ); + final DiskFloppy disk = VirtualizationConfigurationQemuUtils.getArrayIndex( devices, index ); if ( disk != null ) { if ( fileName == null ) { diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskStorageDevices.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskStorageDevices.java index 8d98937e..ca71f7a3 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskStorageDevices.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericDiskStorageDevices.java @@ -6,7 +6,7 @@ import org.openslx.libvirt.domain.Domain; import org.openslx.libvirt.domain.device.Disk.StorageType; import org.openslx.libvirt.domain.device.DiskStorage; import org.openslx.runvirt.plugin.qemu.cmdln.CommandLineArgs; -import org.openslx.virtualization.configuration.machine.QemuMetaDataUtils; +import org.openslx.virtualization.configuration.VirtualizationConfigurationQemuUtils; import org.openslx.virtualization.configuration.transformation.TransformationException; import org.openslx.virtualization.configuration.transformation.TransformationGeneric; @@ -22,7 +22,7 @@ public class TransformationGenericDiskStorageDevices extends TransformationGener private void filterDiskStorageDevice( Domain config, String fileName, int index ) throws TransformationException { final ArrayList<DiskStorage> devices = config.getDiskStorageDevices(); - final DiskStorage disk = QemuMetaDataUtils.getArrayIndex( devices, index ); + final DiskStorage disk = VirtualizationConfigurationQemuUtils.getArrayIndex( devices, index ); if ( disk != null ) { if ( fileName == null ) { 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 8a312433..0417bfdf 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 @@ -7,7 +7,7 @@ import org.openslx.libvirt.domain.device.FileSystem; import org.openslx.libvirt.domain.device.FileSystem.AccessMode; import org.openslx.libvirt.domain.device.FileSystem.Type; import org.openslx.runvirt.plugin.qemu.cmdln.CommandLineArgs; -import org.openslx.virtualization.configuration.machine.QemuMetaDataUtils; +import org.openslx.virtualization.configuration.VirtualizationConfigurationQemuUtils; import org.openslx.virtualization.configuration.transformation.TransformationException; import org.openslx.virtualization.configuration.transformation.TransformationGeneric; @@ -23,7 +23,7 @@ public class TransformationGenericFileSystemDevices extends TransformationGeneri private void filterFileSystemDevice( Domain config, String source, String target, int index ) throws TransformationException { final ArrayList<FileSystem> devices = config.getFileSystemDevices(); - final FileSystem fileSystem = QemuMetaDataUtils.getArrayIndex( devices, index ); + final FileSystem fileSystem = VirtualizationConfigurationQemuUtils.getArrayIndex( devices, index ); if ( fileSystem == null ) { // check if file system device source directory is specified diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericInterfaceDevices.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericInterfaceDevices.java index e4fba36e..3b45de78 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericInterfaceDevices.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericInterfaceDevices.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import org.openslx.libvirt.domain.Domain; import org.openslx.libvirt.domain.device.Interface; import org.openslx.runvirt.plugin.qemu.cmdln.CommandLineArgs; -import org.openslx.virtualization.configuration.machine.QemuMetaDataUtils; +import org.openslx.virtualization.configuration.VirtualizationConfigurationQemuUtils; import org.openslx.virtualization.configuration.transformation.TransformationException; import org.openslx.virtualization.configuration.transformation.TransformationGeneric; @@ -21,7 +21,7 @@ public class TransformationGenericInterfaceDevices extends TransformationGeneric private void filterInterfaceDevice( Domain config, String macAddress, int index ) throws TransformationException { final ArrayList<Interface> devices = config.getInterfaceDevices(); - final Interface device = QemuMetaDataUtils.getArrayIndex( devices, index ); + final Interface device = VirtualizationConfigurationQemuUtils.getArrayIndex( devices, index ); if ( device != null ) { if ( macAddress == null ) { diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericParallelDevices.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericParallelDevices.java index e24a2ac5..7350df32 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericParallelDevices.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationGenericParallelDevices.java @@ -6,7 +6,7 @@ import org.openslx.libvirt.domain.Domain; import org.openslx.libvirt.domain.device.Parallel; import org.openslx.libvirt.domain.device.Parallel.Type; import org.openslx.runvirt.plugin.qemu.cmdln.CommandLineArgs; -import org.openslx.virtualization.configuration.machine.QemuMetaDataUtils; +import org.openslx.virtualization.configuration.VirtualizationConfigurationQemuUtils; import org.openslx.virtualization.configuration.transformation.TransformationException; import org.openslx.virtualization.configuration.transformation.TransformationGeneric; @@ -22,7 +22,7 @@ public class TransformationGenericParallelDevices extends TransformationGeneric< private void filterParallelDevice( Domain config, String fileName, int index ) throws TransformationException { final ArrayList<Parallel> devices = config.getParallelDevices(); - final Parallel device = QemuMetaDataUtils.getArrayIndex( devices, index ); + final Parallel device = VirtualizationConfigurationQemuUtils.getArrayIndex( devices, index ); if ( device == null ) { // check if device file name is specified diff --git a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuSerialDevices.java b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuSerialDevices.java index 9d35fbad..5c4509d7 100644 --- a/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuSerialDevices.java +++ b/core/modules/qemu/runvirt-plugin-qemu/src/main/java/org/openslx/runvirt/plugin/qemu/configuration/TransformationSpecificQemuSerialDevices.java @@ -9,7 +9,7 @@ import org.openslx.libvirt.domain.device.Serial.Type; import org.openslx.libvirt.domain.device.Serial; import org.openslx.runvirt.plugin.qemu.cmdln.CommandLineArgs; import org.openslx.runvirt.plugin.qemu.virtualization.LibvirtHypervisorQemu; -import org.openslx.virtualization.configuration.machine.QemuMetaDataUtils; +import org.openslx.virtualization.configuration.VirtualizationConfigurationQemuUtils; import org.openslx.virtualization.configuration.transformation.TransformationException; import org.openslx.virtualization.configuration.transformation.TransformationSpecific; @@ -33,7 +33,7 @@ public class TransformationSpecificQemuSerialDevices extends TransformationSpeci private void filterSerialDevice( Domain config, String fileName, int index ) throws TransformationException { final ArrayList<Serial> devices = this.getSerialDevDevices( config ); - final Serial device = QemuMetaDataUtils.getArrayIndex( devices, index ); + final Serial device = VirtualizationConfigurationQemuUtils.getArrayIndex( devices, index ); if ( device == null ) { // check if device file name is specified |