Karnan t c has uploaded a new change for review. Change subject: engine:Fixed error message Add/remove/update Gluster Hook ......................................................................
engine:Fixed error message Add/remove/update Gluster Hook proper vdsname is substituted in 'server not up' error message of Gluster Hook resolve conflicts popup Change-Id: If018578d2fe89f9ed10dad948b7bd922033c78e1 Bug-Url: https://bugzilla.redhat.com/977355 Signed-off-by: Karnan TC <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddGlusterHookCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RemoveGlusterHookCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/gluster/GlusterConstants.java 4 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/40517/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddGlusterHookCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddGlusterHookCommand.java index bc7d667..582a6f1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddGlusterHookCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddGlusterHookCommand.java @@ -75,8 +75,10 @@ for (GlusterServerHook serverHook: getMissingServerHooks()) { VDS vds = getVdsDAO().get(serverHook.getServerId()); if (vds == null || vds.getStatus() != VDSStatus.Up) { - setVdsName(vds != null ? vds.getName() : "NO SERVER"); + String vdsName = vds != null ? vds.getName() : GlusterConstants.NO_SERVER; + setVdsName(vdsName); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_SERVER_STATUS_NOT_UP); + addCanDoActionMessage(String.format("$%1$s %2$s", "VdsName", vdsName)); return false; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RemoveGlusterHookCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RemoveGlusterHookCommand.java index 91b2e36..98ad302 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RemoveGlusterHookCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RemoveGlusterHookCommand.java @@ -63,6 +63,7 @@ if (vds.getStatus() != VDSStatus.Up) { setVdsName(vds.getName()); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_SERVER_STATUS_NOT_UP); + addCanDoActionMessage(String.format("$%1$s %2$s", "VdsName", vds.getName())); return false; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommand.java index 72237d4..adcf289 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommand.java @@ -75,8 +75,10 @@ for (GlusterServerHook serverHook: getContentConflictServerHooks()) { VDS vds = getVdsDAO().get(serverHook.getServerId()); if (vds == null || vds.getStatus() != VDSStatus.Up) { - setVdsName(vds != null ? vds.getName() : "NO SERVER"); + String vdsName = vds != null ? vds.getName() : GlusterConstants.NO_SERVER; + setVdsName(vdsName); addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_SERVER_STATUS_NOT_UP); + addCanDoActionMessage(String.format("$%1$s %2$s", "VdsName", vdsName)); return false; } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/gluster/GlusterConstants.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/gluster/GlusterConstants.java index 5a1bcd5..aa8a73d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/gluster/GlusterConstants.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/constants/gluster/GlusterConstants.java @@ -51,4 +51,5 @@ public static final String VOLUME_SNAPSHOT_MAX_HARD_LIMIT = "snap-max-hard-limit"; public static final String VOLUME_SNAPSHOT_NAME = "snapname"; public static final String VDS_GROUP_NAME = "VdsGroupName"; + public static final String NO_SERVER = "NO SERVER"; } -- To view, visit https://gerrit.ovirt.org/40517 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If018578d2fe89f9ed10dad948b7bd922033c78e1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5-gluster Gerrit-Owner: Karnan t c <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
