Moti Asayag has uploaded a new change for review. Change subject: engine: Report failure for missing system host provider ......................................................................
engine: Report failure for missing system host provider If the ovirt-engine has no host provider associated with, the return value of the query should be a failure instead of an empty list of errata. Change-Id: Ica47f1d1c73cb41e672be9aea8be4f65a25f578f Bug-Url: https://bugzilla.redhat.com/1157377 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetErrataForSystemQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 5 files changed, 13 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/39221/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetErrataForSystemQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetErrataForSystemQuery.java index 229e43a..f3893f9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetErrataForSystemQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetErrataForSystemQuery.java @@ -1,12 +1,10 @@ package org.ovirt.engine.core.bll; -import java.util.Collections; - import javax.inject.Inject; import org.ovirt.engine.core.bll.host.provider.HostProviderProxy; import org.ovirt.engine.core.bll.host.provider.foreman.SystemProviderFinder; -import org.ovirt.engine.core.common.businessentities.Erratum; +import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; public class GetErrataForSystemQuery<P extends VdcQueryParametersBase> extends QueriesCommandBase<P> { @@ -22,7 +20,8 @@ protected void executeQueryCommand() { HostProviderProxy proxy = systemProviderFinder.findSystemProvider(); if (proxy == null) { - setReturnValue(Collections.<Erratum> emptyList()); + getQueryReturnValue().setSucceeded(false); + getQueryReturnValue().setExceptionString(VdcBllMessages.NO_HOST_PROVIDER_FOR_SYSTEM.name()); } else { setReturnValue(proxy.getErrataForHost(systemProviderFinder.getSystemHostName())); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java index 65f70b2..1fb74e8 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java @@ -1177,7 +1177,9 @@ // Cinder ACTION_TYPE_FAILED_PROVIDER_NOT_SUPPORTED(ErrorType.NOT_SUPPORTED), ACTION_TYPE_FAILED_CINDER(ErrorType.INTERNAL_ERROR), - CANNOT_ADD_CINDER_DISK_VOLUME_LIMIT_EXCEEDED(ErrorType.CONFLICT); + CANNOT_ADD_CINDER_DISK_VOLUME_LIMIT_EXCEEDED(ErrorType.CONFLICT), + + NO_HOST_PROVIDER_FOR_SYSTEM(ErrorType.NOT_SUPPORTED); private ErrorType messageType; diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index 80a75a1..66fefda 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -1377,3 +1377,5 @@ ACTION_TYPE_FAILED_PROVIDER_NOT_SUPPORTED=Cannot ${action} ${type}. The current type ${providerType} is not supported. ACTION_TYPE_FAILED_CINDER=Cannot ${action} ${type}. An error occurred on Cinder - '${cinderException}'. CANNOT_ADD_CINDER_DISK_VOLUME_LIMIT_EXCEEDED=Cannot ${action} ${type}. Maximum number of volumes allowed (${maxTotalVolumes}) exceeded - could not create Cinder disk ${diskAlias}. + +NO_HOST_PROVIDER_FOR_SYSTEM=The ovirt-engine server is not associated with any host provider. diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java index 58a9e8a..1c4b1a1 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java @@ -3681,4 +3681,7 @@ @DefaultStringValue("Cannot ${action} ${type}. Maximum number of volumes allowed (${maxTotalVolumes}) exceeded - could not create Cinder disk ${diskAlias}.") String CANNOT_ADD_CINDER_DISK_VOLUME_LIMIT_EXCEEDED(); + + @DefaultStringValue("The ovirt-engine server is not associated with any host provider.") + String NO_HOST_PROVIDER_FOR_SYSTEM(); } diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index c8925a2..a3cba4c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -1329,3 +1329,5 @@ ACTION_TYPE_FAILED_PROVIDER_NOT_SUPPORTED=Cannot ${action} ${type}. The current type ${providerType} is not supported. ACTION_TYPE_FAILED_CINDER=Cannot ${action} ${type}. An error occurred on Cinder - '${cinderException}'. CANNOT_ADD_CINDER_DISK_VOLUME_LIMIT_EXCEEDED=Cannot ${action} ${type}. Maximum number of volumes allowed (${maxTotalVolumes}) exceeded - could not create Cinder disk ${diskAlias}. + +NO_HOST_PROVIDER_FOR_SYSTEM=The ovirt-engine server is not associated with any host provider. -- To view, visit https://gerrit.ovirt.org/39221 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ica47f1d1c73cb41e672be9aea8be4f65a25f578f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
