Maor Lipchuk has uploaded a new change for review. Change subject: core: Adding isCinderDomain to StorageType ......................................................................
core: Adding isCinderDomain to StorageType Adding new API to StorageType for Cinder for better use in the code Change-Id: I0aa5839b49c0c8b583712c3a6477cddfc189485a Bug-Url: https://bugzilla.redhat.com/1185826 Signed-off-by: Maor Lipchuk <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/StorageType.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyData.java 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/39161/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 e04ecef..ce29b60 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 @@ -66,4 +66,8 @@ public boolean isOpenStackDomain() { return this == GLANCE || this == CINDER; } + + public boolean isCinderDomain() { + return this == CINDER; + } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyData.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyData.java index c964eb4..39b0542 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyData.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyData.java @@ -312,7 +312,7 @@ for (final StorageDomain domainInDb : domainsInDb) { if (domainInDb.getStorageDomainType() != StorageDomainType.Master && domainInDb.getStatus() != StorageDomainStatus.Locked - && !domainInDb.getStorageType().isOpenStackDomain() + && !domainInDb.getStorageType().isCinderDomain() && !domainsInVds.contains(domainInDb.getId())) { // domain not attached to pool anymore DbFacade.getInstance() -- To view, visit https://gerrit.ovirt.org/39161 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0aa5839b49c0c8b583712c3a6477cddfc189485a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
