From 230e75e440428c4a6309213777f87f7e3e07760f Mon Sep 17 00:00:00 2001 From: Manuel Bentele Date: Tue, 20 Apr 2021 13:56:25 +0200 Subject: Encapsulate transformation logic for virtualization configurations --- .../virtualization/virtualizer/Virtualizer.java | 19 +------------------ .../virtualization/virtualizer/VirtualizerDocker.java | 8 +------- .../virtualization/virtualizer/VirtualizerQemu.java | 8 +------- .../virtualizer/VirtualizerVirtualBox.java | 7 +------ .../virtualization/virtualizer/VirtualizerVmware.java | 8 +------- 5 files changed, 5 insertions(+), 45 deletions(-) (limited to 'src/main/java/org/openslx/virtualization/virtualizer') diff --git a/src/main/java/org/openslx/virtualization/virtualizer/Virtualizer.java b/src/main/java/org/openslx/virtualization/virtualizer/Virtualizer.java index 1411e6a..e74d15e 100644 --- a/src/main/java/org/openslx/virtualization/virtualizer/Virtualizer.java +++ b/src/main/java/org/openslx/virtualization/virtualizer/Virtualizer.java @@ -21,21 +21,14 @@ public abstract class Virtualizer */ protected final org.openslx.bwlp.thrift.iface.Virtualizer internalVirtualizer; - /** - * File name suffix for virtualization configuration files of the virtualizer. - */ - public final String configFileNameSuffix; - /** * Creates a new virtualizer. * * @param internalVirtualizer internal data representation for the new virtualizer. - * @param configFileNameSuffix */ - public Virtualizer( org.openslx.bwlp.thrift.iface.Virtualizer internalVirtualizer, String configFileNameSuffix ) + public Virtualizer( org.openslx.bwlp.thrift.iface.Virtualizer internalVirtualizer ) { this.internalVirtualizer = internalVirtualizer; - this.configFileNameSuffix = configFileNameSuffix; } /** @@ -58,16 +51,6 @@ public abstract class Virtualizer return this.internalVirtualizer.getVirtName(); } - /** - * Returns the file name suffix for virtualization configuration files of the virtualizer. - * - * @return file name suffix for virtualization configuration files of the virtualizer. - */ - public String getConfigFileNameSuffix() - { - return this.configFileNameSuffix; - } - /** * Returns a list of supported disk image formats by the virtualizer. * diff --git a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerDocker.java b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerDocker.java index cd8907a..4461595 100644 --- a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerDocker.java +++ b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerDocker.java @@ -21,11 +21,6 @@ public class VirtualizerDocker extends Virtualizer */ private static final String VIRTUALIZER_NAME = "Docker"; - /** - * File name suffix for virtualization configuration files of the Docker virtualizer. - */ - private static final String VIRTUALIZER_CONFIG_FILE_NAME_SUFFIX = null; - /** * List of supported image formats by the Docker virtualizer. */ @@ -37,8 +32,7 @@ public class VirtualizerDocker extends Virtualizer */ public VirtualizerDocker() { - super( new org.openslx.bwlp.thrift.iface.Virtualizer( TConst.VIRT_DOCKER, VirtualizerDocker.VIRTUALIZER_NAME ), - VirtualizerDocker.VIRTUALIZER_CONFIG_FILE_NAME_SUFFIX ); + super( new org.openslx.bwlp.thrift.iface.Virtualizer( TConst.VIRT_DOCKER, VirtualizerDocker.VIRTUALIZER_NAME )); } @Override diff --git a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java index 0b8c962..731209b 100644 --- a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java +++ b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerQemu.java @@ -21,11 +21,6 @@ public class VirtualizerQemu extends Virtualizer */ private static final String VIRTUALIZER_NAME = "QEMU"; - /** - * File name suffix for virtualization configuration files (Libvirt) of the QEMU virtualizer. - */ - private static final String VIRTUALIZER_CONFIG_FILE_NAME_SUFFIX = "xml"; - /** * List of supported image formats by the QEMU virtualizer. */ @@ -37,8 +32,7 @@ public class VirtualizerQemu extends Virtualizer */ public VirtualizerQemu() { - super( new org.openslx.bwlp.thrift.iface.Virtualizer( TConst.VIRT_QEMU, VirtualizerQemu.VIRTUALIZER_NAME ), - VirtualizerQemu.VIRTUALIZER_CONFIG_FILE_NAME_SUFFIX ); + super( new org.openslx.bwlp.thrift.iface.Virtualizer( TConst.VIRT_QEMU, VirtualizerQemu.VIRTUALIZER_NAME ) ); } @Override diff --git a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVirtualBox.java b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVirtualBox.java index ff2fc2d..77662ab 100644 --- a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVirtualBox.java +++ b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVirtualBox.java @@ -21,11 +21,6 @@ public class VirtualizerVirtualBox extends Virtualizer */ private static final String VIRTUALIZER_NAME = "VirtualBox"; - /** - * File name suffix for virtualization configuration files of the VirtualBox virtualizer. - */ - private static final String VIRTUALIZER_CONFIG_FILE_NAME_SUFFIX = "vbox"; - /** * List of supported image formats by the VirtualBox virtualizer. */ @@ -38,7 +33,7 @@ public class VirtualizerVirtualBox extends Virtualizer public VirtualizerVirtualBox() { super( new org.openslx.bwlp.thrift.iface.Virtualizer( TConst.VIRT_VIRTUALBOX, - VirtualizerVirtualBox.VIRTUALIZER_NAME ), VirtualizerVirtualBox.VIRTUALIZER_CONFIG_FILE_NAME_SUFFIX ); + VirtualizerVirtualBox.VIRTUALIZER_NAME ) ); } @Override diff --git a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java index 48a3ad7..7b766eb 100644 --- a/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java +++ b/src/main/java/org/openslx/virtualization/virtualizer/VirtualizerVmware.java @@ -21,11 +21,6 @@ public class VirtualizerVmware extends Virtualizer */ private static final String VIRTUALIZER_NAME = "VMware"; - /** - * File name suffix for virtualization configuration files of the VMware virtualizer. - */ - private static final String VIRTUALIZER_CONFIG_FILE_NAME_SUFFIX = "vmx"; - /** * List of supported image formats by the VMware virtualizer. */ @@ -37,8 +32,7 @@ public class VirtualizerVmware extends Virtualizer */ public VirtualizerVmware() { - super( new org.openslx.bwlp.thrift.iface.Virtualizer( TConst.VIRT_VMWARE, VirtualizerVmware.VIRTUALIZER_NAME ), - VirtualizerVmware.VIRTUALIZER_CONFIG_FILE_NAME_SUFFIX ); + super( new org.openslx.bwlp.thrift.iface.Virtualizer( TConst.VIRT_VMWARE, VirtualizerVmware.VIRTUALIZER_NAME ) ); } @Override -- cgit v1.2.3-55-g7522