Eli Mesika has uploaded a new change for review.
Change subject: core: fix module name in fencing logs(#652581)
......................................................................
core: fix module name in fencing logs(#652581)
This patch changes the term "Fencing" to "Fence" in all log keys &
messages and class names.
All files marked as the code was deleted & added are a result of a class
name change while the class implementation code is completely identical.
Change-Id: Ica3ced588e67943038016079d0aa51f19d3dfea0
Signed-off-by: Eli Mesika <emes...@redhat.com>
---
R
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java
R
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceQueryBase.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptions2Query.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptionsQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StartVdsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVdsCommand.java
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/VdsNotRespondingTreatmentCommand.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M
backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
R
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/FenceOptionsParser.java
R
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FenceOptionsParserTest.java
R
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
27 files changed, 94 insertions(+), 94 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/8491/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FencingExecutor.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java
similarity index 92%
rename from
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FencingExecutor.java
rename to
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java
index de54452..d26c718 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FencingExecutor.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceExecutor.java
@@ -18,15 +18,15 @@
import org.ovirt.engine.core.utils.linq.Predicate;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
-import org.ovirt.engine.core.utils.pm.VdsFencingOptions;
+import org.ovirt.engine.core.utils.pm.VdsFenceOptions;
-public class FencingExecutor {
+public class FenceExecutor {
private final VDS _vds;
private FenceActionType _action = FenceActionType.forValue(0);
private Guid _vdsToRunId;
private String _vdsToRunName;
- public FencingExecutor(VDS vds, FenceActionType actionType) {
+ public FenceExecutor(VDS vds, FenceActionType actionType) {
_vds = vds;
_action = actionType;
}
@@ -76,7 +76,7 @@
// do not retry getting proxy for Status operation.
if (_action == FenceActionType.Status)
break;
- log.infoFormat("Atempt {0} to find fencing proxy host
failed...", ++count);
+ log.infoFormat("Atempt {0} to find fence proxy host
failed...", ++count);
try {
Thread.sleep(delayInMs);
} catch (Exception e) {
@@ -138,8 +138,8 @@
managementPort = _vds.getpm_port().toString();
}
// get real agent and default parameters
- String agent = VdsFencingOptions.getRealAgent(_vds.getpm_type());
- String managementOptions =
VdsFencingOptions.getDefaultAgentOptions(_vds.getpm_type(),_vds.getpm_options());
+ String agent = VdsFenceOptions.getRealAgent(_vds.getpm_type());
+ String managementOptions =
VdsFenceOptions.getDefaultAgentOptions(_vds.getpm_type(),_vds.getpm_options());
log.infoFormat("Executing <{0}> Power Management command, Proxy
Host:{1}, "
+ "Agent:{2}, Target Host:{3}, Management IP:{4}, User:{5},
Options:{6}", actionType, _vdsToRunName,
agent, _vds.getvds_name(), _vds.getManagmentIp(),
_vds.getpm_user(), managementOptions);
@@ -153,5 +153,5 @@
managementOptions, actionType));
}
- private static Log log = LogFactory.getLog(FencingExecutor.class);
+ private static Log log = LogFactory.getLog(FenceExecutor.class);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FencingQueryBase.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceQueryBase.java
similarity index 84%
rename from
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FencingQueryBase.java
rename to
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceQueryBase.java
index 652c90b..d4db40c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FencingQueryBase.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceQueryBase.java
@@ -5,8 +5,8 @@
import org.ovirt.engine.core.common.queries.*;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.*;
-public abstract class FencingQueryBase<P extends VdcQueryParametersBase>
extends QueriesCommandBase<P> {
- protected FencingQueryBase(P parameters) {
+public abstract class FenceQueryBase<P extends VdcQueryParametersBase> extends
QueriesCommandBase<P> {
+ protected FenceQueryBase(P parameters) {
super(parameters);
}
@@ -49,6 +49,6 @@
* Alerts if power management status failed.
*/
protected void AlertPowerManagementStatusFailed(String reason) {
- Alert(AuditLogType.VDS_ALERT_FENCING_TEST_FAILED, reason);
+ Alert(AuditLogType.VDS_ALERT_FENCE_TEST_FAILED, reason);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
index 1afc6bd..90e6d0a 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
@@ -34,7 +34,7 @@
public abstract class FenceVdsBaseCommand<T extends FenceVdsActionParameters>
extends VdsCommand<T> {
private final int SLEEP_BEFORE_FIRST_ATTEMPT = 5000;
private static Log log = LogFactory.getLog(FenceVdsBaseCommand.class);
- protected FencingExecutor _executor;
+ protected FenceExecutor _executor;
protected List<VM> mVmList = null;
private boolean privateFencingSucceeded;
@@ -129,7 +129,7 @@
}
}
else {
- addCanDoActionMessage(VdcBllMessages.VDS_FENCING_DISABLED);
+ addCanDoActionMessage(VdcBllMessages.VDS_FENCE_DISABLED);
}
getReturnValue().setSucceeded(retValue);
return retValue;
@@ -142,12 +142,12 @@
try {
// Set status immediately to prevent a race (BZ 636950/656224)
setStatus();
- _executor = new FencingExecutor(getVds(),
getParameters().getAction());
+ _executor = new FenceExecutor(getVds(),
getParameters().getAction());
if (_executor.FindVdsToFence()) {
vdsReturnValue = _executor.Fence();
setFencingSucceeded(vdsReturnValue.getSucceeded());
if (getFencingSucceeded()) {
- _executor = new FencingExecutor(getVds(),
FenceActionType.Status);
+ _executor = new FenceExecutor(getVds(),
FenceActionType.Status);
if (waitForStatus(getVds().getvds_name(),
getParameters().getAction())) {
handleSpecificCommandActions();
}
@@ -168,7 +168,7 @@
log.errorFormat("Failed to {0} VDS",
getParameters().getAction()
.name()
.toLowerCase());
- throw new
VdcBLLException(VdcBllErrors.VDS_FENCING_OPERATION_FAILED);
+ throw new
VdcBLLException(VdcBllErrors.VDS_FENCE_OPERATION_FAILED);
} else { // Fencing operation was skipped because Host is
already in the requested state.
setStatus(lastStatus);
}
@@ -189,8 +189,8 @@
*
* @return An executor used to check the availability of a proxy host.
*/
- protected FencingExecutor createExecutorForProxyCheck() {
- return new FencingExecutor(getVds(), FenceActionType.Status);
+ protected FenceExecutor createExecutorForProxyCheck() {
+ return new FenceExecutor(getVds(), FenceActionType.Status);
}
protected void DestroyVmOnDestination(VM vm) {
@@ -298,7 +298,7 @@
AuditLogableBase auditLogable = new AuditLogableBase();
auditLogable.AddCustomValue("Host", vdsName);
auditLogable.AddCustomValue("Status", actionName);
- AuditLogDirector.log(auditLogable,
AuditLogType.VDS_ALERT_FENCING_STATUS_VERIFICATION_FAILED);
+ AuditLogDirector.log(auditLogable,
AuditLogType.VDS_ALERT_FENCE_STATUS_VERIFICATION_FAILED);
log.errorFormat("Failed to verify host {0} {1} status. Have
retried {2} times with delay of {3} seconds between each retry.",
vdsName,
ACTION_NAME,
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptions2Query.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptions2Query.java
index 9ce22b1..a764fb9 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptions2Query.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptions2Query.java
@@ -3,9 +3,9 @@
import java.util.HashMap;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
-import org.ovirt.engine.core.utils.pm.VdsFencingOptions;
+import org.ovirt.engine.core.utils.pm.VdsFenceOptions;
-public class GetAgentFenceOptions2Query<P extends VdcQueryParametersBase>
extends FencingQueryBase<P> {
+public class GetAgentFenceOptions2Query<P extends VdcQueryParametersBase>
extends FenceQueryBase<P> {
public GetAgentFenceOptions2Query(P parameters) {
super(parameters);
@@ -13,7 +13,7 @@
@Override
protected void executeQueryCommand() {
- VdsFencingOptions options = new VdsFencingOptions();
+ VdsFenceOptions options = new VdsFenceOptions();
HashMap<String, HashMap<String, String>> map =
options.getFencingOptionMappingMap2();
getQueryReturnValue().setReturnValue(map);
getQueryReturnValue().setSucceeded(map.size() > 0);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptionsQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptionsQuery.java
index 160cfed..92f88ee 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptionsQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptionsQuery.java
@@ -2,9 +2,9 @@
import org.ovirt.engine.core.common.queries.ValueObjectMap;
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
-import org.ovirt.engine.core.utils.pm.VdsFencingOptions;
+import org.ovirt.engine.core.utils.pm.VdsFenceOptions;
-public class GetAgentFenceOptionsQuery<P extends VdcQueryParametersBase>
extends FencingQueryBase<P> {
+public class GetAgentFenceOptionsQuery<P extends VdcQueryParametersBase>
extends FenceQueryBase<P> {
public GetAgentFenceOptionsQuery(P parameters) {
super(parameters);
@@ -12,7 +12,7 @@
@Override
protected void executeQueryCommand() {
- VdsFencingOptions options = new VdsFencingOptions();
+ VdsFenceOptions options = new VdsFenceOptions();
ValueObjectMap map = options.getFencingOptionMappingMap();
getQueryReturnValue().setReturnValue(map);
getQueryReturnValue().setSucceeded(map.asMap().size() > 0);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java
index 3812203..5e08ef5 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetNewVdsFenceStatusQuery.java
@@ -9,7 +9,7 @@
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
-public class GetNewVdsFenceStatusQuery<P extends
GetNewVdsFenceStatusParameters> extends FencingQueryBase<P> {
+public class GetNewVdsFenceStatusQuery<P extends
GetNewVdsFenceStatusParameters> extends FenceQueryBase<P> {
public GetNewVdsFenceStatusQuery(P parameters) {
super(parameters);
@@ -28,7 +28,7 @@
tempVar.setpm_user(getParameters().getUser());
tempVar.setpm_password(getParameters().getPassword());
VDS vds = tempVar;
- FencingExecutor executor = new FencingExecutor(vds,
FenceActionType.Status);
+ FenceExecutor executor = new FenceExecutor(vds,
FenceActionType.Status);
if (executor.FindVdsToFence()) {
VDSReturnValue returnValue = executor.Fence();
if (returnValue.getReturnValue() != null) {
@@ -38,7 +38,7 @@
getQueryReturnValue().setSucceeded(false);
getQueryReturnValue().setReturnValue(
new FenceStatusReturnValue(UNKNOWN, AuditLogDirector
-
.GetMessage(AuditLogType.VDS_ALERT_FENCING_NO_PROXY_HOST)));
+
.GetMessage(AuditLogType.VDS_ALERT_FENCE_NO_PROXY_HOST)));
}
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java
index ea8d9f9..a8a7407 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVdsFenceStatusQuery.java
@@ -10,7 +10,7 @@
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AlertDirector;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
-public class GetVdsFenceStatusQuery<P extends VdsIdParametersBase> extends
FencingQueryBase<P> {
+public class GetVdsFenceStatusQuery<P extends VdsIdParametersBase> extends
FenceQueryBase<P> {
public GetVdsFenceStatusQuery(P parameters) {
super(parameters);
@@ -22,7 +22,7 @@
VDS vds =
DbFacade.getInstance().getVdsDao().get(getParameters().getVdsId());
setVdsId(vds.getId());
setVdsName(vds.getvds_name());
- FencingExecutor executor = new FencingExecutor(vds,
FenceActionType.Status);
+ FenceExecutor executor = new FenceExecutor(vds,
FenceActionType.Status);
VDSReturnValue returnValue = null;
if (executor.FindVdsToFence()) {
returnValue = executor.Fence();
@@ -42,7 +42,7 @@
"Failed to run Power Management command on Host %1$s, no
running proxy Host was found.",
vds.getvds_name());
getQueryReturnValue().setReturnValue(new
FenceStatusReturnValue("unknown", msg));
-
AlertPowerManagementStatusFailed(AuditLogDirector.GetMessage(AuditLogType.VDS_ALERT_FENCING_NO_PROXY_HOST));
+
AlertPowerManagementStatusFailed(AuditLogDirector.GetMessage(AuditLogType.VDS_ALERT_FENCE_NO_PROXY_HOST));
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
index 208b28d..9719760 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
@@ -84,7 +84,7 @@
}
private void processFencing() {
- FencingExecutor executor = new FencingExecutor(getVds(),
FenceActionType.Status);
+ FenceExecutor executor = new FenceExecutor(getVds(),
FenceActionType.Status);
// check first if we have any VDS to act as the proxy for fencing
// actions.
if (getVds().getpm_enabled() && executor.FindVdsToFence()) {
@@ -217,14 +217,14 @@
if (getVds().getpm_enabled()) {
if (!_vdsProxyFound) {
logable.AddCustomValue("Reason",
-
AuditLogDirector.GetMessage(AuditLogType.VDS_ALERT_FENCING_NO_PROXY_HOST));
- AlertDirector.Alert(logable,
AuditLogType.VDS_ALERT_FENCING_TEST_FAILED);
+
AuditLogDirector.GetMessage(AuditLogType.VDS_ALERT_FENCE_NO_PROXY_HOST));
+ AlertDirector.Alert(logable,
AuditLogType.VDS_ALERT_FENCE_TEST_FAILED);
} else if (!_fenceStatusReturnValue.getIsSucceeded()) {
logable.AddCustomValue("Reason",
_fenceStatusReturnValue.getMessage());
- AlertDirector.Alert(logable,
AuditLogType.VDS_ALERT_FENCING_TEST_FAILED);
+ AlertDirector.Alert(logable,
AuditLogType.VDS_ALERT_FENCE_TEST_FAILED);
}
} else {
- AlertDirector.Alert(logable,
AuditLogType.VDS_ALERT_FENCING_IS_NOT_CONFIGURED);
+ AlertDirector.Alert(logable,
AuditLogType.VDS_ALERT_FENCE_IS_NOT_CONFIGURED);
}
return type;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsCommand.java
index cf793eb..c84d2ab 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestartVdsCommand.java
@@ -107,7 +107,7 @@
@Override
protected void HandleError() {
- addCanDoActionMessage(VdcBllMessages.VDS_FENCING_OPERATION_FAILED);
+ addCanDoActionMessage(VdcBllMessages.VDS_FENCE_OPERATION_FAILED);
addCanDoActionMessage(VdcBllMessages.VAR__TYPE__HOST);
addCanDoActionMessage(VdcBllMessages.VAR__ACTION__RESTART);
log.errorFormat("Failed to run RestartVdsCommand on vds :{0}",
getVdsName());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StartVdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StartVdsCommand.java
index e276725..4764880 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StartVdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StartVdsCommand.java
@@ -50,7 +50,7 @@
@Override
public AuditLogType getAuditLogTypeValue() {
- addCanDoActionMessage(VdcBllMessages.VDS_FENCING_OPERATION_FAILED);
+ addCanDoActionMessage(VdcBllMessages.VDS_FENCE_OPERATION_FAILED);
addCanDoActionMessage(VdcBllMessages.VAR__TYPE__HOST);
addCanDoActionMessage(VdcBllMessages.VAR__ACTION__START);
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVdsCommand.java
index 59e0fc8..660cc14 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVdsCommand.java
@@ -50,7 +50,7 @@
@Override
protected void HandleError() {
- addCanDoActionMessage(VdcBllMessages.VDS_FENCING_OPERATION_FAILED);
+ addCanDoActionMessage(VdcBllMessages.VDS_FENCE_OPERATION_FAILED);
addCanDoActionMessage(VdcBllMessages.VAR__TYPE__HOST);
addCanDoActionMessage(VdcBllMessages.VAR__ACTION__STOP);
log.errorFormat("Failed to run StopVdsCommand on vds :{0}",
getVdsName());
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 7d0e16a..44c9de6 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
@@ -116,13 +116,13 @@
}
if (!vdsStatic.getpm_enabled() ||
StringUtils.isEmpty(vdsStatic.getpm_type())) {
- Alert(AuditLogType.VDS_ALERT_FENCING_IS_NOT_CONFIGURED);
+ Alert(AuditLogType.VDS_ALERT_FENCE_IS_NOT_CONFIGURED);
// remove any test failure alerts
AlertDirector.RemoveVdsAlert(vdsStatic.getId(),
- AuditLogType.VDS_ALERT_FENCING_TEST_FAILED);
+ AuditLogType.VDS_ALERT_FENCE_TEST_FAILED);
} else {
AlertDirector.RemoveVdsAlert(vdsStatic.getId(),
- AuditLogType.VDS_ALERT_FENCING_IS_NOT_CONFIGURED);
+ AuditLogType.VDS_ALERT_FENCE_IS_NOT_CONFIGURED);
}
}
@@ -143,7 +143,7 @@
* Alerts if power management operation failed.
*/
protected void AlertIfPowerManagementOperationFailed() {
- Alert(AuditLogType.VDS_ALERT_FENCING_OPERATION_FAILED);
+ Alert(AuditLogType.VDS_ALERT_FENCE_OPERATION_FAILED);
}
/**
@@ -151,7 +151,7 @@
* @param operation The operation name.
*/
protected void AlertIfPowerManagementOperationSkipped(String operation) {
- Alert(AuditLogType.VDS_ALERT_FENCING_OPERATION_SKIPPED,operation);
+ Alert(AuditLogType.VDS_ALERT_FENCE_OPERATION_SKIPPED,operation);
}
protected void LogSettingVmToDown(Guid vdsId, Guid vmId) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsNotRespondingTreatmentCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsNotRespondingTreatmentCommand.java
index 1a43eb8..85d2f5e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsNotRespondingTreatmentCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsNotRespondingTreatmentCommand.java
@@ -36,8 +36,8 @@
* @return The executor, which is used to check if a proxy is available
for fencing the host.
*/
@Override
- protected FencingExecutor createExecutorForProxyCheck() {
- return new FencingExecutor(getVds(), getParameters().getAction());
+ protected FenceExecutor createExecutorForProxyCheck() {
+ return new FenceExecutor(getVds(), getParameters().getAction());
}
/**
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
index 828fde8..c8ac5b8 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
@@ -608,12 +608,12 @@
USER_ACCOUNT_DISABLED_OR_LOCKED(1100,
AuditLogTimeInterval.HOUR.getValue()),
USER_ACCOUNT_PASSWORD_EXPIRED(1101, AuditLogTimeInterval.HOUR.getValue()),
- VDS_ALERT_FENCING_IS_NOT_CONFIGURED(9000),
- VDS_ALERT_FENCING_TEST_FAILED(9001),
- VDS_ALERT_FENCING_OPERATION_FAILED(9002),
- VDS_ALERT_FENCING_OPERATION_SKIPPED(9003),
- VDS_ALERT_FENCING_NO_PROXY_HOST(9004),
- VDS_ALERT_FENCING_STATUS_VERIFICATION_FAILED(9005),
+ VDS_ALERT_FENCE_IS_NOT_CONFIGURED(9000),
+ VDS_ALERT_FENCE_TEST_FAILED(9001),
+ VDS_ALERT_FENCE_OPERATION_FAILED(9002),
+ VDS_ALERT_FENCE_OPERATION_SKIPPED(9003),
+ VDS_ALERT_FENCE_NO_PROXY_HOST(9004),
+ VDS_ALERT_FENCE_STATUS_VERIFICATION_FAILED(9005),
CANNOT_HIBERNATE_RUNNING_VMS_AFTER_CLUSTER_CPU_UPGRADE(9006),
TASK_STOPPING_ASYNC_TASK(9500, AuditLogTimeInterval.MINUTE.getValue()),
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
index fb4fe2a..2d1b716 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllErrors.java
@@ -366,7 +366,7 @@
VM_TEMPLATE_CANT_LOCATE_DISKS_IN_DB(5018),
USER_FAILED_POPULATE_DATA(5019),
DB_NO_SUCH_VM(5020),
- VDS_FENCING_OPERATION_FAILED(5021),
+ VDS_FENCE_OPERATION_FAILED(5021),
VDS_NETWORK_ERROR(5022),
NO_FREE_VM_IN_POOL(5023),
ENGINE_ERROR_CREATING_STORAGE_POOL(5024),
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
index 6097270..845390b 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java
@@ -201,7 +201,7 @@
VDS_CANNOT_CLEAR_VMS_WRONG_STATUS,
VDS_NEW_CLUSTER_ILLEGAL,
VDS_CLUSTER_IS_NOT_VALID,
- VDS_FENCING_DISABLED,
+ VDS_FENCE_DISABLED,
VDS_CANNOT_INSTALL_STATUS_ILLEGAL,
VDS_CANNOT_UPGRADE_BETWEEN_MAJOR_VERSION,
VDS_CANNOT_INSTALL_MISSING_IMAGE_FILE,
@@ -496,7 +496,7 @@
CONFIG_UNKNOWN_KEY,
ACTION_TYPE_FAILED_BOOKMARK_NAME_ALREADY_EXISTS,
ACTION_TYPE_FAILED_BOOKMARK_INVALID_ID,
- VDS_FENCING_OPERATION_FAILED,
+ VDS_FENCE_OPERATION_FAILED,
ACTION_NOT_SUPPORTED_FOR_CLUSTER_POOL_LEVEL,
CAN_DO_ACTION_GENERAL_FAILURE,
CAN_DO_ACTION_DATABASE_CONNECTION_FAILURE,
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
index e1bfbd3..f84b8db 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
@@ -197,11 +197,11 @@
mSeverities.put(AuditLogType.VDS_REGISTER_FAILED,
AuditLogSeverity.ERROR);
mSeverities.put(AuditLogType.VDS_REGISTER_SUCCEEDED,
AuditLogSeverity.NORMAL);
mSeverities.put(AuditLogType.VDS_REGISTER_EXISTING_VDS_UPDATE_FAILED,
AuditLogSeverity.ERROR);
- mSeverities.put(AuditLogType.VDS_ALERT_FENCING_IS_NOT_CONFIGURED,
AuditLogSeverity.ALERT);
- mSeverities.put(AuditLogType.VDS_ALERT_FENCING_TEST_FAILED,
AuditLogSeverity.ALERT);
- mSeverities.put(AuditLogType.VDS_ALERT_FENCING_OPERATION_FAILED,
AuditLogSeverity.ALERT);
- mSeverities.put(AuditLogType.VDS_ALERT_FENCING_OPERATION_SKIPPED,
AuditLogSeverity.ALERT);
-
mSeverities.put(AuditLogType.VDS_ALERT_FENCING_STATUS_VERIFICATION_FAILED,
AuditLogSeverity.ALERT);
+ mSeverities.put(AuditLogType.VDS_ALERT_FENCE_IS_NOT_CONFIGURED,
AuditLogSeverity.ALERT);
+ mSeverities.put(AuditLogType.VDS_ALERT_FENCE_TEST_FAILED,
AuditLogSeverity.ALERT);
+ mSeverities.put(AuditLogType.VDS_ALERT_FENCE_OPERATION_FAILED,
AuditLogSeverity.ALERT);
+ mSeverities.put(AuditLogType.VDS_ALERT_FENCE_OPERATION_SKIPPED,
AuditLogSeverity.ALERT);
+
mSeverities.put(AuditLogType.VDS_ALERT_FENCE_STATUS_VERIFICATION_FAILED,
AuditLogSeverity.ALERT);
mSeverities.put(AuditLogType.VDS_RUN_IN_NO_KVM_MODE,
AuditLogSeverity.ERROR);
mSeverities.put(AuditLogType.VDS_VERSION_NOT_SUPPORTED_FOR_CLUSTER,
AuditLogSeverity.ERROR);
mSeverities.put(AuditLogType.VDS_CPU_LOWER_THAN_CLUSTER,
AuditLogSeverity.WARNING);
@@ -261,7 +261,7 @@
mSeverities.put(AuditLogType.VDS_MANUAL_FENCE_STATUS_FAILED,
AuditLogSeverity.ERROR);
mSeverities.put(AuditLogType.VDS_MANUAL_FENCE_FAILED_CALL_FENCE_SPM,
AuditLogSeverity.WARNING);
mSeverities.put(AuditLogType.USER_VDS_MAINTENANCE,
AuditLogSeverity.NORMAL);
- mSeverities.put(AuditLogType.VDS_ALERT_FENCING_NO_PROXY_HOST,
AuditLogSeverity.NORMAL);
+ mSeverities.put(AuditLogType.VDS_ALERT_FENCE_NO_PROXY_HOST,
AuditLogSeverity.NORMAL);
mSeverities.put(AuditLogType.VDS_LOW_MEM, AuditLogSeverity.WARNING);
mSeverities.put(AuditLogType.VDS_STORAGE_CONNECTION_FAILED_BUT_LAST_VDS,
AuditLogSeverity.ERROR);
mSeverities.put(AuditLogType.VDS_STORAGE_VDS_STATS_FAILED,
AuditLogSeverity.ERROR);
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
index a329a73..8469bc6 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -95,7 +95,7 @@
VDS_PORT_CHANGE_REQUIRE_INSTALL=The Host Port number cannot be changed without
reinstalling the Host.
VDS_PORT_IS_NOT_LEGAL=The Port number must be between 1 and 65536.
VDS_TRY_CREATE_SECURE_CERTIFICATE_NOT_FOUND=Cannot add new Host using a
secured connection, Certificate file could not be found.
-VDS_FENCING_DISABLED=Cannot fence Host, Host fencing is disabled.
+VDS_FENCE_DISABLED=Cannot fence Host, Host fence is disabled.
VDS_FENCE_DISABLED_AT_SYSTEM_STARTUP_INTERVAL=Fencing is disabled due to oVirt
Engine service start up sequence.
VDS_FENCE_DISABLED_AT_QUIET_TIME=Another Power Management operation is still
running, please retry in ${seconds} Sec.
TEMPLATE_IMAGE_NOT_EXIST=Cannot ${action} ${type}. Template's image doesn't
exist.
@@ -461,7 +461,7 @@
ACTION_TYPE_FAILED_MIGRATE_BETWEEN_TWO_CLUSTERS=Cannot ${action} ${type}. VM
can be migrated only between Hosts in the same Cluster.\n\
-Please select target Host in the same Cluster to run the VM.
VDS_CANNOT_CHECK_VERSION_HOST_NON_RESPONSIVE=Cannot get Host version when Host
is in Non Responsive status.
-ACTION_TYPE_FAILED_VDS_INTERMITENT_CONNECTIVITY=Due to intermittent
connectivity to this Host, fencing operations are not allowed at this time. The
system is trying to reconnect, please try again in 30 seconds.
+ACTION_TYPE_FAILED_VDS_INTERMITENT_CONNECTIVITY=Due to intermittent
connectivity to this Host, fence operations are not allowed at this time. The
system is trying to reconnect, please try again in 30 seconds.
ACTION_TYPE_FAILED_PM_ENABLED_WITHOUT_AGENT=Cannot ${action} ${type}. Power
Management is enabled for Host but no Agent type selected.
ACTION_TYPE_FAILED_PM_ENABLED_WITHOUT_AGENT_CREDENTIALS=Cannot ${action}
${type}. Power Management is enabled for Host but Agent credentials are missing.
ACTION_TYPE_FAILED_AGENT_NOT_SUPPORTED=Cannot ${action} ${type}. Selected
Power Management Agent is not supported.
@@ -619,7 +619,7 @@
ERROR_CANNOT_DEACTIVATE_MASTER_WITH_LOCKED_DOMAINS=You are trying to
deactivate a Master storage domain while there are locked domains in the Data
Center. Please wait for the operations on those domains to finish first.
TAGS_CANNOT_REMOVE_TAG_NOT_EXIST=Cannot remove tag. Tag does not exist.
VAR__TYPE__VM__CLUSTER=$type VM Cluster
-VDS_FENCING_OPERATION_FAILED=Cannot ${action} ${type}. Fencing operation
failed.
+VDS_FENCE_OPERATION_FAILED=Cannot ${action} ${type}. Fence operation failed.
VM_CANNOT_WITHOUT_ACTIVE_STORAGE_DOMAIN_ISO=Cannot ${action} without active
ISO domain.
CAN_DO_ACTION_GENERAL_FAILURE - General command validation failure.
ERROR_CANNOT_REMOVE_ACTIVE_STORAGE_POOL - Cannot remove an active Data Center.
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
index f97fa1b..0b28c7e 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
@@ -500,12 +500,12 @@
IMPORTEXPORT_REMOVE_VM_FAILED=Failed to remove Vm ${VmName} remove from
${StorageDomainName}
USER_ADD_ROLE_WITH_ACTION_GROUP=Role ${RoleName} was added by ${UserName}
USER_ADD_ROLE_WITH_ACTION_GROUP_FAILED=Failed to add role ${RoleName}
-VDS_ALERT_FENCING_IS_NOT_CONFIGURED=Failed to verify Power Management
configuration for Host ${VdsName}.
-VDS_ALERT_FENCING_TEST_FAILED=Power Management test failed for Host
${VdsName}.${Reason}
-VDS_ALERT_FENCING_OPERATION_FAILED=Failed to power fence host ${VdsName}.
Please check the host status and it's power management settings, and then
manually reboot it and click "Confirm Host Has Been Rebooted"
-VDS_ALERT_FENCING_OPERATION_SKIPPED=Host ${VdsName} became non-responsive. It
has no power management configured. Please check the host status, manually
reboot it, and click "Confirm Host Has Been Rebooted"
-VDS_ALERT_FENCING_NO_PROXY_HOST=There is no other host in the data center that
can be used to test the power management settings.
-VDS_ALERT_FENCING_STATUS_VERIFICATION_FAILED=Failed to verify Host ${Host}
${Status} status, Please ${Status} Host ${Host} manually.
+VDS_ALERT_FENCE_IS_NOT_CONFIGURED=Failed to verify Power Management
configuration for Host ${VdsName}.
+VDS_ALERT_FENCE_TEST_FAILED=Power Management test failed for Host
${VdsName}.${Reason}
+VDS_ALERT_FENCE_OPERATION_FAILED=Failed to power fence host ${VdsName}. Please
check the host status and it's power management settings, and then manually
reboot it and click "Confirm Host Has Been Rebooted"
+VDS_ALERT_FENCE_OPERATION_SKIPPED=Host ${VdsName} became non-responsive. It
has no power management configured. Please check the host status, manually
reboot it, and click "Confirm Host Has Been Rebooted"
+VDS_ALERT_FENCE_NO_PROXY_HOST=There is no other host in the data center that
can be used to test the power management settings.
+VDS_ALERT_FENCE_STATUS_VERIFICATION_FAILED=Failed to verify Host ${Host}
${Status} status, Please ${Status} Host ${Host} manually.
TASK_STOPPING_ASYNC_TASK=Stopping async task ${CommandName} that started at
${Date}
REFRESH_REPOSITORY_FILE_LIST_FAILED=Failed to refresh the following Iso
domains :${isoDomains}. Please check domain activity.
REFRESH_REPOSITORY_FILE_LIST_SUCCEEDED=Succeeded to refresh Iso domain :
${isoDomains}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
index 4c89644..c1cee45 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java
@@ -82,7 +82,7 @@
import org.ovirt.engine.api.restapi.resource.utils.FeaturesHelper;
import org.ovirt.engine.api.restapi.types.MappingLocator;
import org.ovirt.engine.api.restapi.types.NetworkUsage;
-import org.ovirt.engine.api.restapi.util.FencingOptionsParser;
+import org.ovirt.engine.api.restapi.util.FenceOptionsParser;
import org.ovirt.engine.api.restapi.util.ServerCpuParser;
import org.ovirt.engine.api.restapi.util.VersionHelper;
import org.ovirt.engine.api.restapi.utils.CustomPropertiesParser;
@@ -349,7 +349,7 @@
}
private List<PowerManagement> getPowerManagers(Version version) {
- return FencingOptionsParser.parse(getConfigurationValue(String.class,
ConfigurationValues.VdsFenceOptionMapping, version),
+ return FenceOptionsParser.parse(getConfigurationValue(String.class,
ConfigurationValues.VdsFenceOptionMapping, version),
getConfigurationValue(String.class,
ConfigurationValues.VdsFenceOptionTypes, version),
true);
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/FencingOptionsParser.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/FenceOptionsParser.java
similarity index 98%
rename from
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/FencingOptionsParser.java
rename to
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/FenceOptionsParser.java
index a394e61..0b1dc9c 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/FencingOptionsParser.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/FenceOptionsParser.java
@@ -9,7 +9,7 @@
import org.ovirt.engine.api.model.Option;
import org.ovirt.engine.api.model.Options;
-public class FencingOptionsParser {
+public class FenceOptionsParser {
/* Format of @str is <agent>;<agent>;...
* Format of @typeStr is <name>=<type>,<name=type>,...
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FencingOptionsParserTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FenceOptionsParserTest.java
similarity index 96%
rename from
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FencingOptionsParserTest.java
rename to
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FenceOptionsParserTest.java
index 9452074..523d44c 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FencingOptionsParserTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FenceOptionsParserTest.java
@@ -8,9 +8,9 @@
import org.ovirt.engine.api.model.PowerManagement;
import org.ovirt.engine.api.model.Option;
-import static org.ovirt.engine.api.restapi.util.FencingOptionsParser.parse;
+import static org.ovirt.engine.api.restapi.util.FenceOptionsParser.parse;
-public class FencingOptionsParserTest extends Assert {
+public class FenceOptionsParserTest extends Assert {
@Test
public void testParseEmpty() {
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFencingOptions.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
similarity index 97%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFencingOptions.java
rename to
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
index fc13099..4063953 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFencingOptions.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
@@ -16,7 +16,7 @@
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
-public class VdsFencingOptions implements Serializable {
+public class VdsFenceOptions implements Serializable {
private static final long serialVersionUID = -8832636627473217232L;
private static final String COMMA = ",";
@@ -31,7 +31,7 @@
private static final String AGENT_ERROR = "Cannot find fencing agent named
{0} in fencing option mapping";
private static final String MAPPING_FORMAT_ERROR = "Illegal fencing
mapping format {0}";
- private static Log log = LogFactory.getLog(VdsFencingOptions.class);
+ private static Log log = LogFactory.getLog(VdsFenceOptions.class);
private static HashMap<String, HashMap<String, String>>
fencingOptionMapping;
private static HashMap<String, String> fencingOptionTypes;
@@ -41,22 +41,22 @@
private static HashSet<String> fencingSpecialParams;
/**
- * Initializes a new instance of the <see cref="VdsFencingOptions"/> class.
+ * Initializes a new instance of the <see cref="VdsFenceOptions"/> class.
*/
- public VdsFencingOptions() {
+ public VdsFenceOptions() {
InitCache();
Init();
}
/**
- * Initializes a new instance of the <see cref="VdsFencingOptions"/> class.
+ * Initializes a new instance of the <see cref="VdsFenceOptions"/> class.
*
* @param agent
* The agent.
* @param fencingOptions
* The fencing options.
*/
- public VdsFencingOptions(String agent, String fencingOptions) {
+ public VdsFenceOptions(String agent, String fencingOptions) {
if (!StringHelper.isNullOrEmpty(agent)) {
this.fenceAgent = agent;
this.fencingOptions = fencingOptions;
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java
index 8e9a90a..e8f4a4f 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java
@@ -9,7 +9,7 @@
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AlertDirector;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase;
-import org.ovirt.engine.core.utils.pm.VdsFencingOptions;
+import org.ovirt.engine.core.utils.pm.VdsFenceOptions;
public class FenceVdsVDSCommand<P extends FenceVdsVDSCommandParameters>
extends VdsBrokerCommand<P> {
private FenceStatusReturnForXmlRpc _result;
@@ -40,12 +40,12 @@
* The reason.
*/
protected void AlertPowerManagementStatusFailed(String reason) {
- Alert(AuditLogType.VDS_ALERT_FENCING_TEST_FAILED, reason);
+ Alert(AuditLogType.VDS_ALERT_FENCE_TEST_FAILED, reason);
}
@Override
protected void ExecuteVdsBrokerCommand() {
- VdsFencingOptions vdsFencingOptions = new
VdsFencingOptions(getParameters().getType(),
+ VdsFenceOptions vdsFencingOptions = new
VdsFenceOptions(getParameters().getType(),
getParameters().getOptions());
String options = vdsFencingOptions.ToInternalString();
// ignore starting already started host or stopping already stopped
host.
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
index 5870303..1d71fb6 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
@@ -226,8 +226,8 @@
@DefaultStringValue("Cannot add new Host using a secured connection,
Certificate file could not be found.")
String VDS_TRY_CREATE_SECURE_CERTIFICATE_NOT_FOUND();
- @DefaultStringValue("Cannot fence Host, Host fencing is disabled.")
- String VDS_FENCING_DISABLED();
+ @DefaultStringValue("Cannot fence Host, Host fence is disabled.")
+ String VDS_FENCE_DISABLED();
@DefaultStringValue("Fencing is disabled due to oVirt Engine service start
up sequence.")
String VDS_FENCE_DISABLED_AT_SYSTEM_STARTUP_INTERVAL();
@@ -1213,7 +1213,7 @@
@DefaultStringValue("Cannot get Host version when Host is in Non
Responsive status.")
String VDS_CANNOT_CHECK_VERSION_HOST_NON_RESPONSIVE();
- @DefaultStringValue("Due to intermittent connectivity to this Host,
fencing operations are not allowed at this time. The system is trying to
reconnect, please try again in 30 seconds.")
+ @DefaultStringValue("Due to intermittent connectivity to this Host, fence
operations are not allowed at this time. The system is trying to reconnect,
please try again in 30 seconds.")
String ACTION_TYPE_FAILED_VDS_INTERMITENT_CONNECTIVITY();
@DefaultStringValue("Cannot ${action} ${type}. Power Management is enabled
for Host but no Agent type selected.")
@@ -1654,8 +1654,8 @@
@DefaultStringValue("${type} VM Cluster.")
String VAR__TYPE__VM__CLUSTER();
- @DefaultStringValue("Cannot ${action} ${type}. Fencing operation failed.")
- String VDS_FENCING_OPERATION_FAILED();
+ @DefaultStringValue("Cannot ${action} ${type}. Fence operation failed.")
+ String VDS_FENCE_OPERATION_FAILED();
@DefaultStringValue("Cannot ${action} without active ISO domain.")
String VM_CANNOT_WITHOUT_ACTIVE_STORAGE_DOMAIN_ISO();
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index e8fcbb8..7cb145d 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -95,7 +95,7 @@
VDS_PORT_CHANGE_REQUIRE_INSTALL=The Host Port number cannot be changed without
reinstalling the Host.
VDS_PORT_IS_NOT_LEGAL=The Port number must be between 1 and 65536.
VDS_TRY_CREATE_SECURE_CERTIFICATE_NOT_FOUND=Cannot add new Host using a
secured connection, Certificate file could not be found.
-VDS_FENCING_DISABLED=Cannot fence Host, Host fencing is disabled.
+VDS_FENCE_DISABLED=Cannot fence Host, Host fence is disabled.
VDS_FENCE_DISABLED_AT_SYSTEM_STARTUP_INTERVAL=Fencing is disabled due to oVirt
Engine service start up sequence.
VDS_FENCE_DISABLED_AT_QUIET_TIME=Another Power Management operation is still
running, please retry in ${seconds} Sec.
TEMPLATE_IMAGE_NOT_EXIST=Cannot ${action} ${type}. Template's image doesn't
exist.
@@ -459,7 +459,7 @@
ACTION_TYPE_FAILED_MIGRATE_BETWEEN_TWO_CLUSTERS=Cannot ${action} ${type}. VM
can be migrated only between Hosts in the same Cluster.\n\
-Please select target Host in the same Cluster to run the VM.
VDS_CANNOT_CHECK_VERSION_HOST_NON_RESPONSIVE=Cannot get Host version when Host
is in Non Responsive status.
-ACTION_TYPE_FAILED_VDS_INTERMITENT_CONNECTIVITY=Due to intermittent
connectivity to this Host, fencing operations are not allowed at this time. The
system is trying to reconnect, please try again in 30 seconds.
+ACTION_TYPE_FAILED_VDS_INTERMITENT_CONNECTIVITY=Due to intermittent
connectivity to this Host, fence operations are not allowed at this time. The
system is trying to reconnect, please try again in 30 seconds.
ACTION_TYPE_FAILED_PM_ENABLED_WITHOUT_AGENT=Cannot ${action} ${type}. Power
Management is enabled for Host but no Agent type selected.
ACTION_TYPE_FAILED_PM_ENABLED_WITHOUT_AGENT_CREDENTIALS=Cannot ${action}
${type}. Power Management is enabled for Host but Agent credentials are missing.
ACTION_TYPE_FAILED_AGENT_NOT_SUPPORTED=Cannot ${action} ${type}. Selected
Power Management Agent is not supported.
@@ -614,7 +614,7 @@
ERROR_CANNOT_DEACTIVATE_MASTER_WITH_LOCKED_DOMAINS=You are trying to
deactivate a Master storage domain while there are locked domains in the Data
Center. Please wait for the operations on those domains to finish first.
TAGS_CANNOT_REMOVE_TAG_NOT_EXIST=Cannot remove tag. Tag does not exist.
VAR__TYPE__VM__CLUSTER=$type VM Cluster
-VDS_FENCING_OPERATION_FAILED=Cannot ${action} ${type}. Fencing operation
failed.
+VDS_FENCE_OPERATION_FAILED=Cannot ${action} ${type}. Fence operation failed.
VM_CANNOT_WITHOUT_ACTIVE_STORAGE_DOMAIN_ISO=Cannot ${action} without active
ISO domain.
CAN_DO_ACTION_GENERAL_FAILURE - General command validation failure.
ERROR_CANNOT_REMOVE_ACTIVE_STORAGE_POOL - Cannot remove an active Data Center.
diff --git
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index 5300979..64252bd 100644
---
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -94,7 +94,7 @@
VDS_PORT_CHANGE_REQUIRE_INSTALL=The Host Port number cannot be changed without
reinstalling the Host.
VDS_PORT_IS_NOT_LEGAL=The Port number must be between 1 and 65536.
VDS_TRY_CREATE_SECURE_CERTIFICATE_NOT_FOUND=Cannot add new Host using a
secured connection, Certificate file could not be found.
-VDS_FENCING_DISABLED=Cannot fence Host, Host fencing is disabled.
+VDS_FENCE_DISABLED=Cannot fence Host, Host fence is disabled.
VDS_FENCE_DISABLED_AT_SYSTEM_STARTUP_INTERVAL=Fencing is disabled due to oVirt
Engine service start up sequence.
VDS_FENCE_DISABLED_AT_QUIET_TIME=Another Power Management operation is still
running, please retry in ${seconds} Sec.
TEMPLATE_IMAGE_NOT_EXIST=Cannot ${action} ${type}. Template's image doesn't
exist.
@@ -457,7 +457,7 @@
ACTION_TYPE_FAILED_MIGRATE_BETWEEN_TWO_CLUSTERS=Cannot ${action} ${type}. VM
can be migrated only between Hosts in the same Cluster.\n\
-Please select target Host in the same Cluster to run the VM.
VDS_CANNOT_CHECK_VERSION_HOST_NON_RESPONSIVE=Cannot get Host version when Host
is in Non Responsive status.
-ACTION_TYPE_FAILED_VDS_INTERMITENT_CONNECTIVITY=Due to intermittent
connectivity to this Host, fencing operations are not allowed at this time. The
system is trying to reconnect, please try again in 30 seconds.
+ACTION_TYPE_FAILED_VDS_INTERMITENT_CONNECTIVITY=Due to intermittent
connectivity to this Host, fence operations are not allowed at this time. The
system is trying to reconnect, please try again in 30 seconds.
ACTION_TYPE_FAILED_PM_ENABLED_WITHOUT_AGENT=Cannot ${action} ${type}. Power
Management is enabled for Host but no Agent type selected.
ACTION_TYPE_FAILED_PM_ENABLED_WITHOUT_AGENT_CREDENTIALS=Cannot ${action}
${type}. Power Management is enabled for Host but Agent credentials are missing.
ACTION_TYPE_FAILED_AGENT_NOT_SUPPORTED=Cannot ${action} ${type}. Selected
Power Management Agent is not supported.
@@ -613,7 +613,7 @@
ERROR_CANNOT_DEACTIVATE_MASTER_WITH_LOCKED_DOMAINS=You are trying to
deactivate a Master storage domain while there are locked domains in the Data
Center. Please wait for the operations on those domains to finish first.
TAGS_CANNOT_REMOVE_TAG_NOT_EXIST=Cannot remove tag. Tag does not exist.
VAR__TYPE__VM__CLUSTER=$type VM Cluster
-VDS_FENCING_OPERATION_FAILED=Cannot ${action} ${type}. Fencing operation
failed.
+VDS_FENCE_OPERATION_FAILED=Cannot ${action} ${type}. Fence operation failed.
VM_CANNOT_WITHOUT_ACTIVE_STORAGE_DOMAIN_ISO=Cannot ${action} without active
ISO domain.
CAN_DO_ACTION_GENERAL_FAILURE - General command validation failure.
ERROR_CANNOT_REMOVE_ACTIVE_STORAGE_POOL - Cannot remove an active Data Center.
--
To view, visit http://gerrit.ovirt.org/8491
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica3ced588e67943038016079d0aa51f19d3dfea0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Eli Mesika <emes...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
