Roy Golan has posted comments on this change.
Change subject: webadmin, core: Prevent arch mismatches in the FE
......................................................................
Patch Set 8:
(7 comments)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllowedServerCpuListQuery.java
Line 16: }
Line 17:
Line 18: @Override
Line 19: protected void executeQueryCommand() {
Line 20: VDSGroup cluster =
getDbFacade().getVdsGroupDao().get(getParameters().getClusterId());
let query the db only if the arch != undefined
if (arch == undefined || clusterHasVmsOrHosts()) {
... return all
}
return filterByArch()
clusterHasVMsOrHosts() {
return query for vms && query for hosts
}
Line 21:
Line 22: List<VdsStatic> allVdsForVdsGroup =
getDbFacade().getVdsStaticDao().getAllForVdsGroup(cluster.getId());
Line 23:
Line 24: List<VM> allVmsForVdsGroup =
getDbFacade().getVmDao().getAllForVdsGroup(cluster.getId());
Line 25:
Line 26: List<ServerCpu> cpuList =
CpuFlagsManagerHandler.AllServerCpuList(getParameters().getVersion());
Line 27:
Line 28: if ((allVdsForVdsGroup.isEmpty() &&
allVmsForVdsGroup.isEmpty())
Line 29: ||
cluster.getArchitecture().equals(ArchitectureType.undefined))
==
Line 30: {
Line 31: getQueryReturnValue().setReturnValue(cpuList);
Line 32: } else {
Line 33: ArrayList<ServerCpu> filteredList = new
ArrayList<ServerCpu>();
Line 33: ArrayList<ServerCpu> filteredList = new
ArrayList<ServerCpu>();
Line 34:
Line 35: for (ServerCpu sc : cpuList) {
Line 36:
Line 37: if
(cluster.getArchitecture().equals(sc.getArchitecture())) {
==
Line 38: filteredList.add(sc);
Line 39: }
Line 40: }
Line 41:
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsGroupsByStoragePoolIdAndFlagsQuery.java
Line 28:
CpuFlagsManagerHandler.FindMaxServerCpuByFlags(getParameters().getString(),
Line 29: cluster.getcompatibility_version());
Line 30:
Line 31: if (sc != null) {
Line 32: if
(cluster.getArchitecture().equals(ArchitectureType.undefined)
==
Line 33: ||
sc.getArchitecture().equals(cluster.getArchitecture())) {
Line 34: filteredList.add(cluster);
Line 35: }
Line 36: }
Line 29: cluster.getcompatibility_version());
Line 30:
Line 31: if (sc != null) {
Line 32: if
(cluster.getArchitecture().equals(ArchitectureType.undefined)
Line 33: ||
sc.getArchitecture().equals(cluster.getArchitecture())) {
==
Line 34: filteredList.add(cluster);
Line 35: }
Line 36: }
Line 37: }
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetAllowedServerCpuListParameters.java
Line 1: package org.ovirt.engine.core.common.queries;
Line 2:
Line 3: import org.ovirt.engine.core.compat.Guid;
Line 4: import org.ovirt.engine.core.compat.Version;
Line 5:
we don't have to come up with a new class.
let generelize GetAllServerCpuListParameter by adding cluster id to it
Line 6: public class GetAllowedServerCpuListParameters extends
VdcQueryParametersBase {
Line 7: private static final long serialVersionUID = -6048741913142095068L;
Line 8:
Line 9: public GetAllowedServerCpuListParameters(Guid clusterId, Version
version) {
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/IdAndStringQueryParameters.java
Line 2:
Line 3: import org.ovirt.engine.core.compat.Guid;
Line 4:
Line 5: /**
Line 6: * Parameter class for the "GetById" queries
this is too general. what do you mean? any other usages?
Line 7: */
Line 8: public class IdAndStringQueryParameters extends VdcQueryParametersBase {
Line 9:
Line 10: private static final long serialVersionUID = -4601447036978553847L;
--
To view, visit http://gerrit.ovirt.org/19132
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I0033c399061108c4495029ae2bca3f62e75fac68
Gerrit-PatchSet: 8
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Vitor de Lima <[email protected]>
Gerrit-Reviewer: Gustavo Frederico Temple Pedrosa
<[email protected]>
Gerrit-Reviewer: Leonardo Bianconi <[email protected]>
Gerrit-Reviewer: Martin Betak <[email protected]>
Gerrit-Reviewer: Michal Skrivanek <[email protected]>
Gerrit-Reviewer: Omer Frenkel <[email protected]>
Gerrit-Reviewer: Roy Golan <[email protected]>
Gerrit-Reviewer: Tomas Jelinek <[email protected]>
Gerrit-Reviewer: Vitor de Lima <[email protected]>
Gerrit-Reviewer: [email protected]
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
