Allon Mureinik has uploaded a new change for review. Change subject: core: Remove GetAvailableClustersByServerCpu ......................................................................
core: Remove GetAvailableClustersByServerCpu GetAvailableClustersByServerCpuQuery is not used anywhere in the code, and hence should be removed. This patch removes the following: 1. The GetAvailableClustersByServerCpuQuery class. 2. The GetAvailableClustersByServerCpu constant representing it in VdcQueryType. 3. The GetAvailableClustersByServerCpuParameters class only used by the aforementioned query. 4. Methods in CpuFlagsManagerHandler only used by the aforementioned query: GetAllServerCpusBelowCpu(String, Version) and GetAllServerCpusBelowCpu(String). Change-Id: Id8bca65412e18c2c62ead41825b08cddd9506c11 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableClustersByServerCpuQuery.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAvailableClustersByServerCpuParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java 4 files changed, 0 insertions(+), 100 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/13600/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java index 5d102ef..e17589f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java @@ -99,20 +99,6 @@ } /** - * Returns all CPU lower than the given CPU INCLUDING IT !!! - * - * @param cpuName - * @return - */ - public static List<ServerCpu> GetAllServerCpusBelowCpu(String cpuName, Version ver) { - final CpuFlagsManager cpuFlagsManager = _managersDictionary.get(ver); - if (cpuFlagsManager != null) { - return cpuFlagsManager.GetAllServerCpusBelowCpu(cpuName); - } - return new ArrayList<ServerCpu>(); - } - - /** * Finds max server cpu by server cpu flags only * * @param flags @@ -360,26 +346,6 @@ public boolean CheckIfCpusExist(String cpuName) { return cpuName != null && (_intelCpuByNameDictionary.containsKey(cpuName) || _amdCpuByNameDictionary.containsKey(cpuName)); - } - - /** - * Returns all CPU lower than the given CPU INCLUDING IT !!! - * - * @param cpuName - * @return - */ - public List<ServerCpu> GetAllServerCpusBelowCpu(String cpuName) { - List<ServerCpu> result = new ArrayList<ServerCpu>(); - if (cpuName != null) { - ServerCpu sc = null; - // find server cpu object - if ((sc = _intelCpuByNameDictionary.get(cpuName)) != null) { - result = _intelCpuList.subList(0, _intelCpuList.indexOf(sc) + 1); - } else if ((sc = _amdCpuByNameDictionary.get(cpuName)) != null) { - result = _amdCpuList.subList(0, _amdCpuList.indexOf(sc) + 1); - } - } - return result; } /** diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableClustersByServerCpuQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableClustersByServerCpuQuery.java deleted file mode 100644 index 8c2cf5a..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAvailableClustersByServerCpuQuery.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.ovirt.engine.core.bll; - -import java.util.List; - -import org.ovirt.engine.core.common.businessentities.ServerCpu; -import org.ovirt.engine.core.common.businessentities.VDSGroup; -import org.ovirt.engine.core.common.queries.GetAvailableClustersByServerCpuParameters; -import org.ovirt.engine.core.compat.Version; -import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.utils.linq.Function; -import org.ovirt.engine.core.utils.linq.LinqUtils; -import org.ovirt.engine.core.utils.linq.Predicate; - -public class GetAvailableClustersByServerCpuQuery<P extends GetAvailableClustersByServerCpuParameters> - extends QueriesCommandBase<P> { - public GetAvailableClustersByServerCpuQuery(P parameters) { - super(parameters); - } - - @Override - protected void executeQueryCommand() { - // get all clusters - List<VDSGroup> allClusters = DbFacade.getInstance().getVdsGroupDao().getAll(); - // get all available cpu names - - String cpuName = getParameters().getCpuName(); - Version version = getParameters().getVersion(); - - final List<String> availableCpus = LinqUtils.foreach( - CpuFlagsManagerHandler.GetAllServerCpusBelowCpu(cpuName, version), new Function<ServerCpu, String>() { - @Override - public String eval(ServerCpu serverCpu) { - return serverCpu.getCpuName(); - } - }); - - getQueryReturnValue().setReturnValue(LinqUtils.filter(allClusters, new Predicate<VDSGroup>() { - @Override - public boolean eval(VDSGroup vdsGroup) { - return availableCpus.contains(vdsGroup.getcpu_name()); - } - })); - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAvailableClustersByServerCpuParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAvailableClustersByServerCpuParameters.java deleted file mode 100644 index 8c1dc4c..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAvailableClustersByServerCpuParameters.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ovirt.engine.core.common.queries; - -import org.ovirt.engine.core.compat.*; - -public class GetAvailableClustersByServerCpuParameters extends GetAllServerCpuListParameters { - private static final long serialVersionUID = -6088424248179452456L; - - public GetAvailableClustersByServerCpuParameters(String cpuName, Version version) { - super(version); - _cpuName = cpuName; - } - - private String _cpuName; - - public String getCpuName() { - return _cpuName; - } - - public GetAvailableClustersByServerCpuParameters() { - } -} 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 ab137b9..901dec5 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 @@ -151,7 +151,6 @@ // License queries GetAllServerCpuList, - GetAvailableClustersByServerCpu, // Multi Level Administration queries GetAllRoles(VdcQueryAuthType.User), -- To view, visit http://gerrit.ovirt.org/13600 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8bca65412e18c2c62ead41825b08cddd9506c11 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
