Yaniv Bronhaim has uploaded a new change for review. Change subject: core: updating report to VdsBroker log (#853883) ......................................................................
core: updating report to VdsBroker log (#853883) https://bugzilla.redhat.com/show_bug.cgi?id=853883 1.changing vdsName print to HostName. 2.Adding default method to getAdditionalInformation. Change-Id: I05680581ff14ac916e4d9d559476dfb4683ed233 Signed-off-by: Yaniv Bronhaim <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsIdVDSCommandParametersBase.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/IsVmDuringInitiatingVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVmStatusVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java 6 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/7927/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsIdVDSCommandParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsIdVDSCommandParametersBase.java index 22dc0a4..cb8f4ac 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsIdVDSCommandParametersBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsIdVDSCommandParametersBase.java @@ -18,6 +18,6 @@ @Override public String toString() { - return String.format("vdsId = %s", getVdsId()); + return String.format("HostId = %s", getVdsId()); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/IsVmDuringInitiatingVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/IsVmDuringInitiatingVDSCommand.java index 85e2c2b..f020842 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/IsVmDuringInitiatingVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/IsVmDuringInitiatingVDSCommand.java @@ -13,9 +13,4 @@ getVDSReturnValue().setReturnValue(ResourceManager.getInstance() .IsVmDuringInitiating(getParameters().getVmId())); } - - @Override - protected String getAdditionalInformation() { - return ""; - } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVmStatusVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVmStatusVDSCommand.java index 5ca4c60..ba8ddd9 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVmStatusVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetVmStatusVDSCommand.java @@ -40,9 +40,4 @@ } DbFacade.getInstance().getVmDynamicDAO().update(vmDynamic); } - - @Override - protected String getAdditionalInformation() { - return ""; - } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java index 66658ed..04c0c0d 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VDSCommandBase.java @@ -1,6 +1,7 @@ package org.ovirt.engine.core.vdsbroker; import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.core.common.errors.VDSError; import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.common.vdscommands.VDSParametersBase; @@ -46,9 +47,9 @@ @Override public String toString() { - String AddInfo = getAdditionalInformation(); + String addInfo = getAdditionalInformation(); return String.format("%s(%s %s)", super.toString(), - (!AddInfo.isEmpty() ? AddInfo + "," : ""), + (!addInfo.isEmpty() ? addInfo + "," : StringUtils.EMPTY), (getParameters() != null ? getParameters().toString() : "null")); } @@ -115,7 +116,7 @@ } protected String getAdditionalInformation() { - return ""; + return StringUtils.EMPTY; } protected abstract void ExecuteVDSCommand(); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java index de7d747..df6894b 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsIdVDSCommandBase.java @@ -34,6 +34,15 @@ } @Override + protected String getAdditionalInformation() { + if (getVds() != null) { + return String.format("HostName = %1$s", getVds().getvds_name()); + } else { + return super.getAdditionalInformation(); + } + } + + @Override protected void ExecuteVDSCommand() { if (_vdsManager != null) { synchronized (_vdsManager.getLockObj()) { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java index a967f44..ed1287a 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java @@ -62,7 +62,7 @@ @Override protected String getAdditionalInformation() { if (getVds() != null) { - return String.format("Vds = %1$s", getVds().getvds_name()); + return String.format("HostName = %1$s", getVds().getvds_name()); } else { return super.getAdditionalInformation(); } -- To view, visit http://gerrit.ovirt.org/7927 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05680581ff14ac916e4d9d559476dfb4683ed233 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
