Daniel Erez has uploaded a new change for review. Change subject: core: add Cinder to StorageType enum ......................................................................
core: add Cinder to StorageType enum Adding 'Cinder' to StorageType enum. Change-Id: I3af65c838546c0fdd1c4f1761a4e9fdbe4df0164 Bug-Url: https://bugzilla.redhat.com/1185826 Signed-off-by: Daniel Erez <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/StorageType.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageTypeTest.java 2 files changed, 10 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/38908/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/StorageType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/StorageType.java index 28874d9..e04ecef 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/StorageType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/StorageType.java @@ -13,9 +13,10 @@ LOCALFS(4, Subtype.FILE), POSIXFS(6, Subtype.FILE), GLUSTERFS(7, Subtype.FILE), - GLANCE(8, Subtype.FILE); + GLANCE(8, Subtype.FILE), + CINDER(9, Subtype.OPENSTACK); - public enum Subtype { NONE, FILE, BLOCK } + public enum Subtype { NONE, FILE, BLOCK, OPENSTACK } private int value; private Subtype subtype; @@ -61,4 +62,8 @@ public boolean isLocal() { return this == LOCALFS; } + + public boolean isOpenStackDomain() { + return this == GLANCE || this == CINDER; + } } diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageTypeTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageTypeTest.java index 7f5825a..5689e99 100644 --- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageTypeTest.java +++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageTypeTest.java @@ -16,6 +16,7 @@ Assert.assertTrue(StorageType.POSIXFS.isFileDomain()); Assert.assertTrue(StorageType.GLUSTERFS.isFileDomain()); Assert.assertTrue(StorageType.GLANCE.isFileDomain()); + Assert.assertFalse(StorageType.CINDER.isFileDomain()); } @Test @@ -27,11 +28,12 @@ Assert.assertFalse(StorageType.POSIXFS.isBlockDomain()); Assert.assertFalse(StorageType.GLUSTERFS.isBlockDomain()); Assert.assertFalse(StorageType.GLANCE.isBlockDomain()); + Assert.assertFalse(StorageType.CINDER.isBlockDomain()); } @Test public void testNewStorageTypes() { Assert.assertTrue("A storage type was added/removed. Update this test, and the isFileDomain/isBlockDomain " + - "method accordingly", StorageType.values().length == 8); + "method accordingly", StorageType.values().length == 9); } } -- To view, visit https://gerrit.ovirt.org/38908 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3af65c838546c0fdd1c4f1761a4e9fdbe4df0164 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
