Itamar Heim has uploaded a new change for review.
Change subject: spelling: s/clsuter/cluster
......................................................................
spelling: s/clsuter/cluster
Change-Id: Icc54bd40f76037c3c58dca8da35d14a69f89283f
Signed-off-by: Itamar Heim <ih...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmValidationUtils.java
3 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/14080/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
index c7a3b74..f3e76c8 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
@@ -160,7 +160,7 @@
AuditLogType.VM_WAS_SET_DOWN_DUE_TO_HOST_REBOOT_OR_MANUAL_FENCE);
}
- protected boolean IsPowerManagementLegal(VdsStatic vdsStatic, String
clsuterCompatibilityVersion) {
+ protected boolean IsPowerManagementLegal(VdsStatic vdsStatic, String
clusterCompatibilityVersion) {
boolean result = true;
if (vdsStatic.isPmEnabled()) {
@@ -169,7 +169,7 @@
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_PM_ENABLED_WITHOUT_AGENT);
result = false;
} else if (!Regex.IsMatch(Config.<String>
GetValue(ConfigValues.VdsFenceType,
- clsuterCompatibilityVersion),
String.format("(,|^)%1$s(,|$)",
+ clusterCompatibilityVersion),
String.format("(,|^)%1$s(,|$)",
vdsStatic.getPmType()))) {
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_AGENT_NOT_SUPPORTED);
result = false;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
index 8135389..c992d33 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
@@ -337,13 +337,13 @@
public static boolean isMemorySizeLegal(VmOsType osType,
int memSizeInMB,
List<String> reasons,
- String clsuter_version) {
- boolean result = VmValidationUtils.isMemorySizeLegal(osType,
memSizeInMB, clsuter_version);
+ String cluster_version) {
+ boolean result = VmValidationUtils.isMemorySizeLegal(osType,
memSizeInMB, cluster_version);
if (!result) {
reasons.add(VdcBllMessages.ACTION_TYPE_FAILED_ILLEGAL_MEMORY_SIZE.toString());
reasons.add(String.format("$minMemorySize %s",
VmValidationUtils.getMinMemorySizeInMb()));
reasons.add(String.format("$maxMemorySize %s",
- VmValidationUtils.getMaxMemorySizeInMb(osType,
clsuter_version)));
+ VmValidationUtils.getMaxMemorySizeInMb(osType,
cluster_version)));
}
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmValidationUtils.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmValidationUtils.java
index 2f2b8b5..d9f886c 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmValidationUtils.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmValidationUtils.java
@@ -16,8 +16,8 @@
*
* @return Is the memory within the configured limits or not.
*/
- public static boolean isMemorySizeLegal(VmOsType osType, int memSizeInMB,
String clsuter_version) {
- return memSizeInMB >= getMinMemorySizeInMb() && memSizeInMB <=
getMaxMemorySizeInMb(osType, clsuter_version);
+ public static boolean isMemorySizeLegal(VmOsType osType, int memSizeInMB,
String cluster_version) {
+ return memSizeInMB >= getMinMemorySizeInMb() && memSizeInMB <=
getMaxMemorySizeInMb(osType, cluster_version);
}
/**
@@ -36,10 +36,10 @@
*
* @return The maximum VM memory setting for this OS (as per
configuration).
*/
- public static Integer getMaxMemorySizeInMb(VmOsType osType, String
clsuter_version) {
+ public static Integer getMaxMemorySizeInMb(VmOsType osType, String
cluster_version) {
if ((osType == VmOsType.Other || osType == VmOsType.OtherLinux)
|| osType.name().toLowerCase().endsWith(X64BIT)) {
- return Config.<Integer>
GetValue(ConfigValues.VM64BitMaxMemorySizeInMB, clsuter_version);
+ return Config.<Integer>
GetValue(ConfigValues.VM64BitMaxMemorySizeInMB, cluster_version);
}
return Config.<Integer>
GetValue(ConfigValues.VM32BitMaxMemorySizeInMB);
}
--
To view, visit http://gerrit.ovirt.org/14080
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icc54bd40f76037c3c58dca8da35d14a69f89283f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Itamar Heim <ih...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
