Eldan Shachar has uploaded a new change for review. Change subject: core: Fix naming in CpuFlagsManagerHandler ......................................................................
core: Fix naming in CpuFlagsManagerHandler Fix naming convention to avoid build errors. Change-Id: I85b83637c1f3ee30a10abb36a86c8dd46a2ac8be Bug-Url: https://bugzilla.redhat.com/838487 Signed-off-by: Eldan Shachar <eshac...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllServerCpuListQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetHostArchitectureQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsByVdsIdQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandleVdsCpuFlagsOrClusterChangedCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsArchitectureHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuLevelFilterPolicyUnit.java 12 files changed, 20 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/34974/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java index 327a71c..d60e24f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsGroupCommand.java @@ -93,8 +93,8 @@ addCanDoActionMessage(VdcBllMessages.VDS_GROUP_CANNOT_DO_ACTION_NAME_IN_USE); result = false; } else if (getVdsGroup().supportsVirtService() - && !CpuFlagsManagerHandler.CheckIfCpusExist(getVdsGroup().getcpu_name(), - getVdsGroup().getcompatibility_version())) { + && !CpuFlagsManagerHandler.checkIfCpusExist(getVdsGroup().getcpu_name(), + getVdsGroup().getcompatibility_version())) { // cpu check required only if the cluster supports Virt service addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_CPU_NOT_FOUND); result = false; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java index ce1dcc9..1113c57 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java @@ -201,7 +201,7 @@ log.info("Running ovirt-engine {}", Config.<String>getValue(ConfigValues.ProductRPMVersion)); _resourceManger = new VDSBrokerFrontendImpl(); - CpuFlagsManagerHandler.InitDictionaries(); + CpuFlagsManagerHandler.initDictionaries(); // ResourceManager res = ResourceManager.Instance; // Initialize the AuditLogCleanupManager diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java index 207331c..58d7e59 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java @@ -116,7 +116,7 @@ return false; } - vds.setCpuName(CpuFlagsManagerHandler.FindMaxServerCpuByFlags(vds.getCpuFlags(), + vds.setCpuName(CpuFlagsManagerHandler.findMaxServerCpuByFlags(vds.getCpuFlags(), getTargetCluster().getcompatibility_version())); 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 83aed3c..d57af53 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 @@ -25,7 +25,7 @@ private static Map<Version, CpuFlagsManager> _managersDictionary = new HashMap<Version, CpuFlagsManager>(); - public static void InitDictionaries() { + public static void initDictionaries() { log.info("Start initializing dictionaries"); _managersDictionary.clear(); for (Version ver : Config.<HashSet<Version>> getValue(ConfigValues.SupportedClusterLevels)) { @@ -50,7 +50,7 @@ return null; } - public static List<ServerCpu> AllServerCpuList(Version ver) { + public static List<ServerCpu> allServerCpuList(Version ver) { final CpuFlagsManager cpuFlagsManager = _managersDictionary.get(ver); if (cpuFlagsManager != null) { return cpuFlagsManager.getAllServerCpuList(); @@ -75,7 +75,7 @@ return null; } - public static boolean CheckIfCpusSameManufacture(String cpuName1, String cpuName2, Version ver) { + public static boolean checkIfCpusSameManufacture(String cpuName1, String cpuName2, Version ver) { final CpuFlagsManager cpuFlagsManager = _managersDictionary.get(ver); if (cpuFlagsManager != null) { return cpuFlagsManager.CheckIfCpusSameManufacture(cpuName1, cpuName2); @@ -83,7 +83,7 @@ return false; } - public static boolean CheckIfCpusExist(String cpuName, Version ver) { + public static boolean checkIfCpusExist(String cpuName, Version ver) { final CpuFlagsManager cpuFlagsManager = _managersDictionary.get(ver); if (cpuFlagsManager != null) { return cpuFlagsManager.CheckIfCpusExist(cpuName); @@ -97,7 +97,7 @@ * @param flags * @return */ - public static ServerCpu FindMaxServerCpuByFlags(String flags, Version ver) { + public static ServerCpu findMaxServerCpuByFlags(String flags, Version ver) { final CpuFlagsManager cpuFlagsManager = _managersDictionary.get(ver); if (cpuFlagsManager != null) { return cpuFlagsManager.FindMaxServerCpuByFlags(flags); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllServerCpuListQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllServerCpuListQuery.java index 6f01899..505017f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllServerCpuListQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllServerCpuListQuery.java @@ -56,6 +56,6 @@ @Override protected void executeQueryCommand() { - getQueryReturnValue().setReturnValue(CpuFlagsManagerHandler.AllServerCpuList(getParameters().getVersion())); + getQueryReturnValue().setReturnValue(CpuFlagsManagerHandler.allServerCpuList(getParameters().getVersion())); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetHostArchitectureQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetHostArchitectureQuery.java index c7e810e..f9010bc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetHostArchitectureQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetHostArchitectureQuery.java @@ -16,7 +16,7 @@ VDS host = getDbFacade().getVdsDao().get(getParameters().getId()); ServerCpu sc = - CpuFlagsManagerHandler.FindMaxServerCpuByFlags(host.getCpuFlags(), + CpuFlagsManagerHandler.findMaxServerCpuByFlags(host.getCpuFlags(), host.getVdsGroupCompatibilityVersion()); getQueryReturnValue().setReturnValue(sc == null ? ArchitectureType.undefined : sc.getArchitecture()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsByVdsIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsByVdsIdQuery.java index 18859ba..595744e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsByVdsIdQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsByVdsIdQuery.java @@ -15,7 +15,7 @@ .get(getParameters().getId()); if (vds != null) { - vds.setCpuName(CpuFlagsManagerHandler.FindMaxServerCpuByFlags(vds.getCpuFlags(), + vds.setCpuName(CpuFlagsManagerHandler.findMaxServerCpuByFlags(vds.getCpuFlags(), vds.getVdsGroupCompatibilityVersion())); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandleVdsCpuFlagsOrClusterChangedCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandleVdsCpuFlagsOrClusterChangedCommand.java index eb250e8..1288188 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandleVdsCpuFlagsOrClusterChangedCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandleVdsCpuFlagsOrClusterChangedCommand.java @@ -48,7 +48,7 @@ VDSGroup grp = DbFacade.getInstance().getVdsGroupDao().get(getVds().getVdsGroupId()); - ServerCpu sc = CpuFlagsManagerHandler.FindMaxServerCpuByFlags(getVds().getCpuFlags(), getVds() + ServerCpu sc = CpuFlagsManagerHandler.findMaxServerCpuByFlags(getVds().getCpuFlags(), getVds() .getVdsGroupCompatibilityVersion()); if (sc == null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java index ecb7bcf..e680d7e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java @@ -166,7 +166,7 @@ @Override public List<VDS> filter(List<VDS> data) { for (VDS vds : data) { - vds.setCpuName(CpuFlagsManagerHandler.FindMaxServerCpuByFlags(vds.getCpuFlags(), + vds.setCpuName(CpuFlagsManagerHandler.findMaxServerCpuByFlags(vds.getCpuFlags(), vds.getVdsGroupCompatibilityVersion())); } return data; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java index 2e4c95d..49b8280 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java @@ -397,13 +397,13 @@ } protected boolean checkIfCpusSameManufacture(VDSGroup group) { - return CpuFlagsManagerHandler.CheckIfCpusSameManufacture(group.getcpu_name(), + return CpuFlagsManagerHandler.checkIfCpusSameManufacture(group.getcpu_name(), getVdsGroup().getcpu_name(), getVdsGroup().getcompatibility_version()); } protected boolean checkIfCpusExist() { - return CpuFlagsManagerHandler.CheckIfCpusExist(getVdsGroup().getcpu_name(), + return CpuFlagsManagerHandler.checkIfCpusExist(getVdsGroup().getcpu_name(), getVdsGroup().getcompatibility_version()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsArchitectureHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsArchitectureHelper.java index fd5c909..7eeb72e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsArchitectureHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsArchitectureHelper.java @@ -23,7 +23,8 @@ public static ArchitectureType getArchitecture(VdsStatic host) { VDSGroup cluster = DbFacade.getInstance().getVdsGroupDao().get(host.getVdsGroupId()); VdsDynamic vdsDynamic = DbFacade.getInstance().getVdsDynamicDao().get(host.getId()); - ServerCpu cpu = CpuFlagsManagerHandler.FindMaxServerCpuByFlags(vdsDynamic.getcpu_flags(), cluster.getcompatibility_version()); + ServerCpu cpu = CpuFlagsManagerHandler.findMaxServerCpuByFlags(vdsDynamic.getcpu_flags(), + cluster.getcompatibility_version()); if (cpu != null && cpu.getArchitecture() != null) { return cpu.getArchitecture(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuLevelFilterPolicyUnit.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuLevelFilterPolicyUnit.java index c2f345b..f75b512 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuLevelFilterPolicyUnit.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuLevelFilterPolicyUnit.java @@ -30,7 +30,8 @@ if (StringUtils.isNotEmpty(vm.getCpuName())) { List<VDS> hostsToRunOn = new ArrayList<VDS>(); for (VDS host : hosts) { - ServerCpu cpu = CpuFlagsManagerHandler.FindMaxServerCpuByFlags(host.getCpuFlags(), host.getVdsGroupCompatibilityVersion()); + ServerCpu cpu = CpuFlagsManagerHandler.findMaxServerCpuByFlags(host.getCpuFlags(), + host.getVdsGroupCompatibilityVersion()); String hostCpuName = cpu == null ? null : cpu.getCpuName(); if (StringUtils.isNotEmpty(hostCpuName)) { int compareResult = CpuFlagsManagerHandler.compareCpuLevels(vm.getCpuName(), hostCpuName, vm.getVdsGroupCompatibilityVersion()); -- To view, visit http://gerrit.ovirt.org/34974 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I85b83637c1f3ee30a10abb36a86c8dd46a2ac8be Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eldan Shachar <eshac...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
