Yevgeny Zaspitsky has uploaded a new change for review. Change subject: engine: add IsManagementNetworkQuery ......................................................................
engine: add IsManagementNetworkQuery Add IsManagementNetworkQuery. The query returns a boolean value that indicates whether the given network serves as the management one in a cluster or not. Add DI support for query classes. Change-Id: I1d5aa288e1952c1440229dbfd60d8bef9f2d1afa Signed-off-by: Yevgeny Zaspitsky <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandsFactory.java A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/IsManagementNetworkQuery.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java 3 files changed, 28 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/37025/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandsFactory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandsFactory.java index bf2159e..cea2cdb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandsFactory.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandsFactory.java @@ -127,7 +127,7 @@ Class<?> type = null; try { type = getCommandClass(query.name(), QueryPrefix); - QueriesCommandBase<?> result = null; + final QueriesCommandBase<?> result; if (engineContext == null) { result = (QueriesCommandBase<?>) findCommandConstructor(type, parameters.getClass()).newInstance(parameters); @@ -137,7 +137,7 @@ engineContext); } - return result; + return Injector.injectMembers(result); } catch (Exception e) { log.error("Command Factory: Failed to create command '{}' using reflection: {}", type, e.getMessage()); log.error("Exception", e); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/IsManagementNetworkQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/IsManagementNetworkQuery.java new file mode 100644 index 0000000..e0ae72d --- /dev/null +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/IsManagementNetworkQuery.java @@ -0,0 +1,25 @@ +package org.ovirt.engine.core.bll.network; + +import javax.inject.Inject; + +import org.ovirt.engine.core.bll.QueriesCommandBase; +import org.ovirt.engine.core.bll.network.cluster.ManagementNetworkUtil; +import org.ovirt.engine.core.common.queries.IdQueryParameters; +import org.ovirt.engine.core.compat.Guid; + +public class IsManagementNetworkQuery<P extends IdQueryParameters> extends QueriesCommandBase<P> { + + @Inject + private ManagementNetworkUtil managementNetworkUtil; + + public IsManagementNetworkQuery(P parameters) { + super(parameters); + } + + @Override + protected void executeQueryCommand() { + final Guid networkId = getParameters().getId(); + + getQueryReturnValue().setReturnValue(managementNetworkUtil.isManagementNetwork(networkId)); + } +} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java index a35fde4..2d6cef2 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java @@ -88,6 +88,7 @@ GetVmsAndNetworkInterfacesByNetworkId, GetVmTemplatesAndNetworkInterfacesByNetworkId, GetNetworkById(VdcQueryAuthType.User), + IsManagementNetwork, // External network providers GetAllExternalNetworksOnProvider, -- To view, visit http://gerrit.ovirt.org/37025 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d5aa288e1952c1440229dbfd60d8bef9f2d1afa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
