Sharad Mishra has uploaded a new change for review. Change subject: core: WIP: Update StoragePoolValidator test to test GlusterFS. ......................................................................
core: WIP: Update StoragePoolValidator test to test GlusterFS. Add tests to run StoragePoolValidator for GlusterFS. DO NOT MERGE - WORK IN PROGRESS Change-Id: Ie4cd98cd06716c31248d8ec4f21a3a6f79f13102 Signed-off-by: Sharad Mishra <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java 4 files changed, 46 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/8836/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java index f56b841..88b05a7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddEmptyStoragePoolCommand.java @@ -73,6 +73,8 @@ result = false; } else if (!storagePoolValidator.isPosixDcAndMatchingCompatiblityVersion()) { result = false; + } else if (!storagePoolValidator.isGlusterDcAndMatchingCompatiblityVersion()) { + result = false; } return result; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java index 0792647..7f79284 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StoragePoolValidator.java @@ -43,6 +43,24 @@ return true; } + /** + * Checks in case the DC is of GLUSTER type that the compatibility version matches. + * In case there is mismatch, a + * proper canDoAction message will be added + * + * @return true if the version matches + */ + public boolean isGlusterDcAndMatchingCompatiblityVersion() { + if (storagePool.getstorage_pool_type() == StorageType.GLUSTERFS + && !this.<Boolean> getConfigValue(ConfigValues.GlusterFsStorageEnabled, + storagePool.getcompatibility_version() + .toString())) { + canDoActionMessages.add(VdcBllMessages.DATA_CENTER_POSIX_STORAGE_NOT_SUPPORTED_IN_CURRENT_VERSION.toString()); + return false; + } + return true; + } + public List<String> getCanDoActionMessages() { return canDoActionMessages; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java index 045f269..c4ffb18 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommand.java @@ -197,6 +197,9 @@ if (returnValue) { returnValue = validator.isPosixDcAndMatchingCompatiblityVersion(); } + if (returnValue) { + returnValue = validator.isGlusterDcAndMatchingCompatiblityVersion(); + } addCanDoActionMessage(VdcBllMessages.VAR__ACTION__UPDATE); return returnValue; } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java index ab6bc2b..7e2a49f 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/StoragePoolValidatorTest.java @@ -32,6 +32,7 @@ StoragePoolStatus.Up.getValue()); validator = spy(new StoragePoolValidator(storagePool, new ArrayList<String>())); mockPosixStorageEnabledConfigValue(); + mockGlusterStorageEnabledConfigValue(); mockLocalStorageEnabledConfigValue(); } @@ -50,6 +51,14 @@ doReturn(false).when(validator).getConfigValue(ConfigValues.LocalStorageEnabled, "general"); } + protected void mockGlusterStorageEnabledConfigValue() { + doReturn(true).when(validator).getConfigValue(ConfigValues.GlusterFsStorageEnabled, Version.v3_2.toString()); + doReturn(false).when(validator).getConfigValue(ConfigValues.GlusterFsStorageEnabled, Version.v3_1.toString()); + doReturn(false).when(validator).getConfigValue(ConfigValues.GlusterFsStorageEnabled, Version.v3_0.toString()); + doReturn(false).when(validator).getConfigValue(ConfigValues.GlusterFsStorageEnabled, Version.v2_2.toString()); + doReturn(false).when(validator).getConfigValue(ConfigValues.GlusterFsStorageEnabled, "general"); + } + @Test public void testPosixDcAndMatchingCompatiblityVersion() { storagePool.setcompatibility_version(Version.v3_1); @@ -66,6 +75,20 @@ } @Test + public void testGlusterDcAndMatchingCompatiblityVersion() { + storagePool.setcompatibility_version(Version.v3_2); + storagePool.setstorage_pool_type(StorageType.GLUSTERFS); + assertTrue(validator.isGlusterDcAndMatchingCompatiblityVersion()); + } + + @Test + public void testGlusterDcAndNotMatchingCompatiblityVersion() { + storagePool.setcompatibility_version(Version.v3_1); + storagePool.setstorage_pool_type(StorageType.GLUSTERFS); + assertFalse(validator.isGlusterDcAndMatchingCompatiblityVersion()); + assertMessages(VdcBllMessages.DATA_CENTER_POSIX_STORAGE_NOT_SUPPORTED_IN_CURRENT_VERSION); + } + @Test public void testLocalDcAndMatchingCompatiblityVersion() { storagePool.setcompatibility_version(Version.v3_0); storagePool.setstorage_pool_type(StorageType.LOCALFS); -- To view, visit http://gerrit.ovirt.org/8836 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4cd98cd06716c31248d8ec4f21a3a6f79f13102 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sharad Mishra <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
