Roy Golan has uploaded a new change for review. Change subject: core: NumaTuneMode - use native enum methods ......................................................................
core: NumaTuneMode - use native enum methods - use the builtin valueOf(String string) - use native name() which returns the enum literal - update VM static to uppercase to fit the literal Change-Id: I162375399a714b3b56cc97429ac7ea5145e21151 Signed-off-by: Roy Golan <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NumaTuneMode.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmBaseDaoDbFacade.java M backend/manager/modules/dal/src/test/resources/fixtures.xml M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NumaSettingFactory.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NumaSettingFactoryTest.java A packaging/dbscripts/upgrade/03_06_1130_update_numatune_to_uppercase.sql 7 files changed, 25 insertions(+), 45 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/39128/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NumaTuneMode.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NumaTuneMode.java index dd74810..c80cdb1 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NumaTuneMode.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/NumaTuneMode.java @@ -1,8 +1,5 @@ package org.ovirt.engine.core.common.businessentities; -import java.util.HashMap; -import java.util.Map; - /** * Libvirt numatune mode definition See http://libvirt.org/formatdomain.html#elementsNUMATuning * @@ -24,25 +21,7 @@ */ PREFERRED; - private String value; - private static Map<String, NumaTuneMode> mappings; - - static { - mappings = new HashMap<String, NumaTuneMode>(); - for (NumaTuneMode mode : values()) { - mappings.put(mode.getValue(), mode); - } - } - - private NumaTuneMode() { - value = name().toLowerCase(); - } - public String getValue() { - return value; - } - - public static NumaTuneMode forValue(String value) { - return mappings.get(value); + return name(); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java index ad30234..8337c8d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java @@ -901,7 +901,7 @@ result = prime * result + (spiceFileTransferEnabled ? 1231 : 1237); result = prime * result + (spiceCopyPasteEnabled ? 1231 : 1237); result = prime * result + ((cpuProfileId == null) ? 0 : cpuProfileId.hashCode()); - result = prime * result + ((numaTuneMode == null) ? 0 : numaTuneMode.getValue().hashCode()); + result = prime * result + ((numaTuneMode == null) ? 0 : numaTuneMode.name().hashCode()); result = prime * result + ((vNumaNodeList == null) ? 0 : vNumaNodeList.hashCode()); result = prime * result + (autoConverge == null ? 0 : autoConverge.hashCode()); result = prime * result + (migrateCompressed == null ? 0 : migrateCompressed.hashCode()); @@ -965,7 +965,7 @@ && spiceFileTransferEnabled == other.spiceFileTransferEnabled && spiceCopyPasteEnabled == other.spiceCopyPasteEnabled && ObjectUtils.objectsEqual(cpuProfileId, other.cpuProfileId) - && ObjectUtils.objectsEqual(numaTuneMode.getValue(), other.numaTuneMode.getValue()) + && ObjectUtils.objectsEqual(numaTuneMode.name(), other.numaTuneMode.name()) && ObjectUtils.objectsEqual(vNumaNodeList, other.vNumaNodeList)) && ObjectUtils.objectsEqual(autoConverge, other.autoConverge) && ObjectUtils.objectsEqual(migrateCompressed, other.migrateCompressed) diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmBaseDaoDbFacade.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmBaseDaoDbFacade.java index 4d53067..13659c7 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmBaseDaoDbFacade.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmBaseDaoDbFacade.java @@ -71,7 +71,7 @@ .addValue("is_spice_file_transfer_enabled", entity.isSpiceFileTransferEnabled()) .addValue("is_spice_copy_paste_enabled", entity.isSpiceCopyPasteEnabled()) .addValue("cpu_profile_id", entity.getCpuProfileId()) - .addValue("numatune_mode", entity.getNumaTuneMode().getValue()) + .addValue("numatune_mode", entity.getNumaTuneMode().name()) .addValue("is_auto_converge", entity.getAutoConverge()) .addValue("is_migrate_compressed", entity.getMigrateCompressed()) .addValue("predefined_properties", entity.getPredefinedProperties()) @@ -132,7 +132,7 @@ entity.setMinAllocatedMem(rs.getInt("min_allocated_mem")); entity.setQuotaId(getGuid(rs, "quota_id")); entity.setCpuProfileId(getGuid(rs, "cpu_profile_id")); - entity.setNumaTuneMode(NumaTuneMode.forValue(rs.getString("numatune_mode"))); + entity.setNumaTuneMode(NumaTuneMode.valueOf(rs.getString("numatune_mode"))); entity.setAutoConverge((Boolean) rs.getObject("is_auto_converge")); entity.setMigrateCompressed((Boolean) rs.getObject("is_migrate_compressed")); String predefinedProperties = rs.getString("predefined_properties"); diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml b/backend/manager/modules/dal/src/test/resources/fixtures.xml index 7fc618e..d174da9 100644 --- a/backend/manager/modules/dal/src/test/resources/fixtures.xml +++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml @@ -2166,7 +2166,7 @@ <value>0</value> <null /> <value>false</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> @@ -2230,7 +2230,7 @@ <null /> <value>Serial number: 123456</value> <value>true</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <value>fd81f1e1-785b-4579-ab75-1419ebb87052</value> @@ -2294,7 +2294,7 @@ <value>2</value> <value>RHVSN: 09123</value> <value>true</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> @@ -2358,7 +2358,7 @@ <value>1</value> <null /> <value>false</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> @@ -2422,7 +2422,7 @@ <value>1</value> <null /> <value>false</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> @@ -2486,7 +2486,7 @@ <null /> <null /> <value>true</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> @@ -2550,7 +2550,7 @@ <null /> <null /> <value>false</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> @@ -2614,7 +2614,7 @@ <null /> <null /> <value>true</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> @@ -2680,7 +2680,7 @@ <value>2</value> <null /> <value>true</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <value>fd81f1e1-785b-4579-ab75-1419ebb87052</value> @@ -2744,7 +2744,7 @@ <null /> <value>VSN 1234</value> <value>true</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> @@ -2808,7 +2808,7 @@ <value>2</value> <value>My very specific serial number</value> <value>true</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> @@ -2872,7 +2872,7 @@ <null /> <value>Custom serial number</value> <value>false</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> @@ -2936,7 +2936,7 @@ <value>1</value> <null /> <value>false</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> @@ -3000,7 +3000,7 @@ <null /> <null /> <value>false</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> @@ -3064,7 +3064,7 @@ <null /> <null /> <value>true</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> @@ -3128,7 +3128,7 @@ <null /> <null /> <value>true</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> @@ -3192,7 +3192,7 @@ <value>0</value> <null /> <value>false</value> - <value>preferred</value> + <value>PREFERRED</value> <value>true</value> <value>true</value> <null /> diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NumaSettingFactory.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NumaSettingFactory.java index da487fb..200356a 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NumaSettingFactory.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NumaSettingFactory.java @@ -72,7 +72,7 @@ } //The two items nodeset and mode should both exist or not if (createNumaTune.containsKey(VdsProperties.NUMA_TUNE_NODESET)) { - createNumaTune.put(VdsProperties.NUMA_TUNE_MODE, numaTuneMode.getValue()); + createNumaTune.put(VdsProperties.NUMA_TUNE_MODE, numaTuneMode.name().toLowerCase()); } return createNumaTune; } diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NumaSettingFactoryTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NumaSettingFactoryTest.java index 461a583..8810dbf 100644 --- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NumaSettingFactoryTest.java +++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NumaSettingFactoryTest.java @@ -60,7 +60,7 @@ NumaSettingFactory.buildVmNumatuneSetting(numaTuneMode, vmNumaNodes, vdsNumaNodes); assertEquals(2, numaTune.size()); assertTrue(numaTune.containsKey(VdsProperties.NUMA_TUNE_MODE)); - assertEquals(NumaTuneMode.INTERLEAVE.getValue(), numaTune.get(VdsProperties.NUMA_TUNE_MODE)); + assertEquals(NumaTuneMode.INTERLEAVE.name(), numaTune.get(VdsProperties.NUMA_TUNE_MODE)); assertTrue(numaTune.containsKey(VdsProperties.NUMA_TUNE_NODESET)); assertEquals("0,1", numaTune.get(VdsProperties.NUMA_TUNE_NODESET)); } diff --git a/packaging/dbscripts/upgrade/03_06_1130_update_numatune_to_uppercase.sql b/packaging/dbscripts/upgrade/03_06_1130_update_numatune_to_uppercase.sql new file mode 100644 index 0000000..37a0cb0 --- /dev/null +++ b/packaging/dbscripts/upgrade/03_06_1130_update_numatune_to_uppercase.sql @@ -0,0 +1 @@ +UPDATE vm_static SET numatune_mode=upper(numatune_mode); -- To view, visit https://gerrit.ovirt.org/39128 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I162375399a714b3b56cc97429ac7ea5145e21151 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
