From 7937083c2df8f1547ce18a9cdd58eaa9c203e073 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 2 Jul 2021 11:20:12 +0200 Subject: [vmware] Less strict filtering Suite <-> dmsd, redo filtering logic Get rid of the old flags for different filtering targets. This was never implemented properly anyways and was confusing to use. Instead, add explicit on-demand filtering to to according transformation methods. --- ...figurationLogicDozModClientToDozModServerTest.java | 1 + ...figurationLogicDozModServerToDozModClientTest.java | 1 + ...urationLogicDozModServerToStatelessClientTest.java | 1 + ...mware-player_default-ubuntu_transform-editable.vmx | 15 +++++++++++++++ ...vmware-player_default-ubuntu_transform-privacy.vmx | 19 +++++++++++++++++++ 5 files changed, 37 insertions(+) (limited to 'src/test') diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java index f078b5e..01408f0 100644 --- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java +++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModClientToDozModServerTest.java @@ -79,6 +79,7 @@ public class ConfigurationLogicDozModClientToDozModServerTest final File expectedConfig = ConfigurationLogicTestResources.getVmwareVmxFile( expectedConfigFileName ); final VirtualizationConfiguration config; config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig ); + assertTrue( config.getHdds().size() == 1 ); final ConfigurationLogicDozModClientToDozModServer logic = new ConfigurationLogicDozModClientToDozModServer(); logic.apply( config, new ConfigurationDataDozModClientToDozModServer() ); diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java index 5ba5e18..844e5ec 100644 --- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java +++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToDozModClientTest.java @@ -95,6 +95,7 @@ public class ConfigurationLogicDozModServerToDozModClientTest final File expectedConfig = ConfigurationLogicTestResources.getVmwareVmxFile( expectedConfigFileName ); final VirtualizationConfiguration config; config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig ); + assertTrue( config.getHdds().size() == 1 ); final ConfigurationLogicDozModServerToDozModClient logic = new ConfigurationLogicDozModServerToDozModClient(); logic.apply( config, ConfigurationLogicDozModServerToDozModClientTest.DEFAULT_CONFIG_DATA ); diff --git a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java index 6c87526..47d8a45 100644 --- a/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java +++ b/src/test/java/org/openslx/virtualization/configuration/logic/ConfigurationLogicDozModServerToStatelessClientTest.java @@ -89,6 +89,7 @@ public class ConfigurationLogicDozModServerToStatelessClientTest final File expectedConfig = ConfigurationLogicTestResources.getVmwareVmxFile( expectedConfigFileName ); final VirtualizationConfiguration config; config = ConfigurationLogicTestUtils.newVirtualizationConfigurationInstance( inputConfig ); + assertTrue( config.getHdds().size() == 1 ); final ConfigurationLogicDozModServerToStatelessClient logic = new ConfigurationLogicDozModServerToStatelessClient(); logic.apply( config, ConfigurationLogicDozModServerToStatelessClientTest.DEFAULT_CONFIG_DATA ); diff --git a/src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-editable.vmx b/src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-editable.vmx index 9d1ad5e..3972aa0 100644 --- a/src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-editable.vmx +++ b/src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-editable.vmx @@ -2,6 +2,7 @@ config.version = "8" displayName = "Test" ehci.present = "TRUE" +ethernet0.addressType = "generated" ethernet0.connectionType = "nat" ethernet0.present = "TRUE" ethernet0.virtualDev = "e1000" @@ -22,8 +23,10 @@ ide0:0.present = "TRUE" ide0:1.autodetect = "TRUE" ide0:1.deviceType = "cdrom-raw" ide0:1.present = "TRUE" +mem.hotadd = "TRUE" memsize = "1536" mks.enable3d = "TRUE" +numvcpus = "1" pciBridge0.present = "TRUE" pciBridge4.functions = "8" pciBridge4.present = "TRUE" @@ -37,18 +40,30 @@ pciBridge6.virtualDev = "pcieRootPort" pciBridge7.functions = "8" pciBridge7.present = "TRUE" pciBridge7.virtualDev = "pcieRootPort" +powerType.powerOff = "soft" +powerType.powerOn = "soft" +powerType.reset = "soft" +powerType.suspend = "soft" +sata0.present = "TRUE" sata0:1.deviceType = "cdrom-raw" +sata0:1.present = "TRUE" scsi0.present = "TRUE" scsi0.virtualDev = "lsilogic" scsi0:0.deviceType = "disk" scsi0:0.fileName = "image-default.vmdk" scsi0:0.present = "TRUE" +serial0.fileName = "thinprint" +serial0.fileType = "thinprint" +serial0.present = "TRUE" sound.autoDetect = "TRUE" sound.fileName = "-1" sound.present = "TRUE" +svga.graphicsMemoryKB = "8388608" tools.syncTime = "FALSE" usb.mangleUsb3Speed = "TRUE" usb.present = "TRUE" usb.vbluetooth.startConnected = "TRUE" +vcpu.hotadd = "TRUE" virtualHW.productCompatibility = "hosted" virtualHW.version = "18" +vmci0.present = "TRUE" diff --git a/src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-privacy.vmx b/src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-privacy.vmx index a08b044..9de07ce 100644 --- a/src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-privacy.vmx +++ b/src/test/resources/vmware/vmx/vmware-player_default-ubuntu_transform-privacy.vmx @@ -3,10 +3,16 @@ .encoding = "UTF-8" config.version = "8" ehci.present = "TRUE" +ethernet0.addressType = "generated" +ethernet0.connectionType = "nat" +ethernet0.present = "TRUE" ethernet0.virtualDev = "e1000" +floppy0.present = "FALSE" guestOS = "ubuntu-64" hpet0.present = "TRUE" +mem.hotadd = "TRUE" mks.enable3d = "TRUE" +numvcpus = "2" pciBridge0.present = "TRUE" pciBridge4.functions = "8" pciBridge4.present = "TRUE" @@ -20,13 +26,26 @@ pciBridge6.virtualDev = "pcieRootPort" pciBridge7.functions = "8" pciBridge7.present = "TRUE" pciBridge7.virtualDev = "pcieRootPort" +powerType.powerOff = "soft" +powerType.powerOn = "soft" +powerType.reset = "soft" +powerType.suspend = "soft" +sata0.present = "TRUE" sata0:1.deviceType = "cdrom-raw" +sata0:1.present = "TRUE" +scsi0.present = "TRUE" scsi0.virtualDev = "lsilogic" +serial0.fileName = "thinprint" +serial0.fileType = "thinprint" +serial0.present = "TRUE" sound.autoDetect = "TRUE" sound.fileName = "-1" sound.present = "TRUE" +svga.graphicsMemoryKB = "8388608" tools.syncTime = "FALSE" usb.present = "TRUE" usb.vbluetooth.startConnected = "TRUE" +vcpu.hotadd = "TRUE" virtualHW.productCompatibility = "hosted" virtualHW.version = "18" +vmci0.present = "TRUE" -- cgit v1.2.3-55-g7522