Shubhendu Tripathi has uploaded a new change for review.
Change subject: gluster: Corrected the event log message
......................................................................
gluster: Corrected the event log message
In case of reset for volume options the event log message is corrected
to be diaplyed on the form "Volume Option ${Key}=${Value} reset on
${glusterVolumeName}."
Change-Id: Icd53a3f6a0ef671562a510275d6dd54417669545
Bug-Url: https://bugzilla.redhat.com/956051
Signed-off-by: Shubhendu Tripathi <shtri...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommandTest.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/VdcEventNotificationUtils.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/ResetGlusterVolumeOptionsParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/ResetGlusterVolumeOptionsVDSParameters.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/AuditLogMessages.properties
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumeResource.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResetGlusterVolumeOptionsVDSCommand.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeParameterListModel.java
M
frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
M
frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
13 files changed, 45 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/84/14884/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommand.java
index 642dafe..8e794bb 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommand.java
@@ -1,10 +1,13 @@
package org.ovirt.engine.core.bll.gluster;
+import java.util.Map;
+
import org.ovirt.engine.core.bll.LockIdNameAttribute;
import org.ovirt.engine.core.bll.NonTransactiveCommandAttribute;
import org.ovirt.engine.core.common.AuditLogType;
import
org.ovirt.engine.core.common.action.gluster.ResetGlusterVolumeOptionsParameters;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeOptionEntity;
+import org.ovirt.engine.core.common.constants.gluster.GlusterConstants;
import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
import
org.ovirt.engine.core.common.vdscommands.gluster.ResetGlusterVolumeOptionsVDSParameters;
@@ -17,8 +20,19 @@
@LockIdNameAttribute(isWait = true)
public class ResetGlusterVolumeOptionsCommand extends
GlusterVolumeCommandBase<ResetGlusterVolumeOptionsParameters> {
+ private boolean isResetAllOptions;
+
public
ResetGlusterVolumeOptionsCommand(ResetGlusterVolumeOptionsParameters params) {
super(params);
+ }
+
+ @Override
+ public Map<String, String> getCustomValues() {
+ if(getParameters().getVolumeOption() != null) {
+ addCustomValue(GlusterConstants.OPTION_KEY,
getParameters().getVolumeOption().getKey());
+ addCustomValue(GlusterConstants.OPTION_VALUE,
getParameters().getVolumeOption().getValue());
+ }
+ return super.getCustomValues();
}
@Override
@@ -36,12 +50,14 @@
if (getSucceeded()) {
- if (getParameters().getVolumeOption() != null &&
!getParameters().getVolumeOption().isEmpty()) {
-
removeOptionInDb(getGlusterVolume().getOption(getParameters().getVolumeOption()));
+ if (getParameters().getVolumeOption() != null &&
!(getParameters().getVolumeOption().getKey().isEmpty())) {
+
removeOptionInDb(getGlusterVolume().getOption(getParameters().getVolumeOption().getKey()));
+ isResetAllOptions = false;
} else {
for (GlusterVolumeOptionEntity option :
getGlusterVolume().getOptions()) {
removeOptionInDb(option);
}
+ isResetAllOptions = true;
}
} else {
handleVdsError(AuditLogType.GLUSTER_VOLUME_OPTIONS_RESET_FAILED,
returnValue.getVdsError().getMessage());
@@ -64,7 +80,7 @@
@Override
public AuditLogType getAuditLogTypeValue() {
if (getSucceeded()) {
- return AuditLogType.GLUSTER_VOLUME_OPTIONS_RESET;
+ return (isResetAllOptions) ?
AuditLogType.GLUSTER_VOLUME_OPTIONS_RESET_ALL :
AuditLogType.GLUSTER_VOLUME_OPTIONS_RESET;
} else {
return errorType == null ?
AuditLogType.GLUSTER_VOLUME_OPTIONS_RESET_FAILED : errorType;
}
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommandTest.java
index 2f861c3..0a2cc91 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommandTest.java
@@ -25,10 +25,10 @@
*/
private ResetGlusterVolumeOptionsCommand cmd;
- private Guid CLUSTER_ID = new Guid("b399944a-81ab-4ec5-8266-e19ba7c3c9d1");
+ private final Guid CLUSTER_ID = new
Guid("b399944a-81ab-4ec5-8266-e19ba7c3c9d1");
private ResetGlusterVolumeOptionsCommand createTestCommand(Guid volumeId) {
- return new ResetGlusterVolumeOptionsCommand(new
ResetGlusterVolumeOptionsParameters(volumeId, "", false));
+ return new ResetGlusterVolumeOptionsCommand(new
ResetGlusterVolumeOptionsParameters(volumeId, null, false));
}
private void prepareMocks(ResetGlusterVolumeOptionsCommand command) {
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 bd6792b..996f0de 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
@@ -250,6 +250,7 @@
GLUSTER_HOOK_ADDED(4050),
GLUSTER_HOOK_REMOVED(4051),
GLUSTER_VOLUME_OPTION_MODIFIED(4052),
+ GLUSTER_VOLUME_OPTIONS_RESET_ALL(4053),
USER_VDS_RESTART(41),
USER_FAILED_VDS_RESTART(107),
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcEventNotificationUtils.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcEventNotificationUtils.java
index a2a7389..79f8c7a 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcEventNotificationUtils.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcEventNotificationUtils.java
@@ -59,6 +59,7 @@
AddEventNotificationEntry(EventNotificationEntity.GlusterVolume,
AuditLogType.GLUSTER_VOLUME_STOP);
AddEventNotificationEntry(EventNotificationEntity.GlusterVolume,
AuditLogType.GLUSTER_VOLUME_STOP_FAILED);
AddEventNotificationEntry(EventNotificationEntity.GlusterVolume,
AuditLogType.GLUSTER_VOLUME_OPTIONS_RESET);
+ AddEventNotificationEntry(EventNotificationEntity.GlusterVolume,
AuditLogType.GLUSTER_VOLUME_OPTIONS_RESET_ALL);
AddEventNotificationEntry(EventNotificationEntity.GlusterVolume,
AuditLogType.GLUSTER_VOLUME_OPTIONS_RESET_FAILED);
AddEventNotificationEntry(EventNotificationEntity.GlusterVolume,
AuditLogType.GLUSTER_VOLUME_DELETE);
AddEventNotificationEntry(EventNotificationEntity.GlusterVolume,
AuditLogType.GLUSTER_VOLUME_DELETE_FAILED);
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/ResetGlusterVolumeOptionsParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/ResetGlusterVolumeOptionsParameters.java
index 306faa0..d9cc7ae 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/ResetGlusterVolumeOptionsParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/ResetGlusterVolumeOptionsParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.action.gluster;
+import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeOptionEntity;
import org.ovirt.engine.core.compat.Guid;
/**
@@ -9,21 +10,21 @@
private static final long serialVersionUID = 6574282602574606939L;
- private String volumeOption;
+ private GlusterVolumeOptionEntity volumeOption;
private boolean forceAction = false;
- public ResetGlusterVolumeOptionsParameters(Guid volumeId, String
volumeOption, boolean forceAction) {
+ public ResetGlusterVolumeOptionsParameters(Guid volumeId,
GlusterVolumeOptionEntity volumeOption, boolean forceAction) {
super(volumeId);
setVolumeOption(volumeOption);
setForceAction(forceAction);
}
- public String getVolumeOption() {
+ public GlusterVolumeOptionEntity getVolumeOption() {
return volumeOption;
}
- public void setVolumeOption(String volumeOption) {
+ public void setVolumeOption(GlusterVolumeOptionEntity volumeOption) {
this.volumeOption = volumeOption;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/ResetGlusterVolumeOptionsVDSParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/ResetGlusterVolumeOptionsVDSParameters.java
index 8cde1bc..a2d2c44 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/ResetGlusterVolumeOptionsVDSParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/ResetGlusterVolumeOptionsVDSParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands.gluster;
+import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeOptionEntity;
import org.ovirt.engine.core.compat.Guid;
/**
@@ -9,16 +10,16 @@
*/
public class ResetGlusterVolumeOptionsVDSParameters extends
GlusterVolumeVDSParameters {
- private String volumeOption;
- private boolean forceAction;
+ private final GlusterVolumeOptionEntity volumeOption;
+ private final boolean forceAction;
- public ResetGlusterVolumeOptionsVDSParameters(Guid serverId, String
volumeName, String volumeOption, boolean forceAction) {
+ public ResetGlusterVolumeOptionsVDSParameters(Guid serverId, String
volumeName, GlusterVolumeOptionEntity volumeOption, boolean forceAction) {
super(serverId, volumeName);
this.volumeOption = volumeOption;
this.forceAction = forceAction;
}
- public String getVolumeOption() {
+ public GlusterVolumeOptionEntity getVolumeOption() {
return volumeOption;
}
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 4764883..542b3bf 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
@@ -69,6 +69,7 @@
severities.put(AuditLogType.GLUSTER_VOLUME_STOP,
AuditLogSeverity.NORMAL);
severities.put(AuditLogType.GLUSTER_VOLUME_STOP_FAILED,
AuditLogSeverity.ERROR);
severities.put(AuditLogType.GLUSTER_VOLUME_OPTIONS_RESET,
AuditLogSeverity.NORMAL);
+ severities.put(AuditLogType.GLUSTER_VOLUME_OPTIONS_RESET_ALL,
AuditLogSeverity.NORMAL);
severities.put(AuditLogType.GLUSTER_VOLUME_OPTIONS_RESET_FAILED,
AuditLogSeverity.ERROR);
severities.put(AuditLogType.GLUSTER_VOLUME_DELETE,
AuditLogSeverity.NORMAL);
severities.put(AuditLogType.GLUSTER_VOLUME_DELETE_FAILED,
AuditLogSeverity.ERROR);
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 d252d53..db9a216 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AuditLogMessages.properties
@@ -557,7 +557,8 @@
GLUSTER_VOLUME_START_FAILED=Could not start Gluster Volume
${glusterVolumeName}.
GLUSTER_VOLUME_STOP=Gluster Volume ${glusterVolumeName} stopped.
GLUSTER_VOLUME_STOP_FAILED=Could not stop Gluster Volume ${glusterVolumeName}.
-GLUSTER_VOLUME_OPTIONS_RESET=Gluster Volume ${glusterVolumeName} Options reset.
+GLUSTER_VOLUME_OPTIONS_RESET=Volume Option ${Key}=${Value} reset on
${glusterVolumeName}.
+GLUSTER_VOLUME_OPTIONS_RESET_ALL=All Volume Options reset on
${glusterVolumeName}.
GLUSTER_VOLUME_OPTIONS_RESET_FAILED=Could not reset Gluster Volume
${glusterVolumeName} Options.
GLUSTER_VOLUME_DELETE=Gluster Volume ${glusterVolumeName} deleted.
GLUSTER_VOLUME_DELETE_FAILED=Could not delete Gluster Volume
${glusterVolumeName}.
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumeResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumeResource.java
index 0511cc9..c6b81b8 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumeResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumeResource.java
@@ -85,18 +85,18 @@
public Response resetOption(Action action) {
Option option = action.getOption();
validateParameters(option, "name");
- return resetOption(action, option.getName(), action.isSetForce() ?
action.isForce() : false);
+ return resetOption(action, option.getName(), option.getValue(),
action.isSetForce() ? action.isForce() : false);
}
@Override
public Response resetAllOptions(Action action) {
- return resetOption(action, null, action.isSetForce() ?
action.isForce() : false);
+ return resetOption(action, null, null, action.isSetForce() ?
action.isForce() : false);
}
- private Response resetOption(Action action, String optionName, boolean
force) {
+ private Response resetOption(Action action, String optionName, String
optionValue, boolean force) {
return doAction(VdcActionType.ResetGlusterVolumeOptions,
new ResetGlusterVolumeOptionsParameters(guid,
- optionName,
+ new GlusterVolumeOptionEntity(guid, optionName,
optionValue),
force), action);
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResetGlusterVolumeOptionsVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResetGlusterVolumeOptionsVDSCommand.java
index 6bc9e78..9f33dd2 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResetGlusterVolumeOptionsVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResetGlusterVolumeOptionsVDSCommand.java
@@ -14,7 +14,7 @@
protected void ExecuteVdsBrokerCommand() {
status =
getBroker().glusterVolumeReset(getParameters().getVolumeName(),
- (getParameters().getVolumeOption() == null) ? "" :
getParameters().getVolumeOption(),
+ (getParameters().getVolumeOption() == null) ? "" :
getParameters().getVolumeOption().getKey(),
getParameters().isforceAction());
ProceedProxyReturnValue();
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeParameterListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeParameterListModel.java
index 1423120..94611ea 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeParameterListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeParameterListModel.java
@@ -324,7 +324,7 @@
GlusterVolumeOptionEntity selectedOption = (GlusterVolumeOptionEntity)
getSelectedItem();
ResetGlusterVolumeOptionsParameters parameters =
- new
ResetGlusterVolumeOptionsParameters(selectedOption.getVolumeId(),
selectedOption.getKey(), false);
+ new
ResetGlusterVolumeOptionsParameters(selectedOption.getVolumeId(),
selectedOption, false);
model.startProgress(null);
diff --git
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
index 46d53ad..979fb4a 100644
---
a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
+++
b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java
@@ -228,6 +228,8 @@
String AuditLogType___GLUSTER_VOLUME_OPTIONS_RESET();
+ String AuditLogType___GLUSTER_VOLUME_OPTIONS_RESET_ALL();
+
String AuditLogType___GLUSTER_VOLUME_OPTIONS_RESET_FAILED();
String AuditLogType___GLUSTER_VOLUME_DELETE();
diff --git
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
index f9d5cf2..d4d8450 100644
---
a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
+++
b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties
@@ -110,6 +110,7 @@
AuditLogType___GLUSTER_VOLUME_STOP=Gluster volume stopped
AuditLogType___GLUSTER_VOLUME_STOP_FAILED=Gluster Volume could not be stopped
AuditLogType___GLUSTER_VOLUME_OPTIONS_RESET=Gluster Volume Options reset
+AuditLogType___GLUSTER_VOLUME_OPTIONS_RESET_ALL=All the Gluster Volume Options
reset
AuditLogType___GLUSTER_VOLUME_OPTIONS_RESET_FAILED=Gluster Volume Options
could not be reset
AuditLogType___GLUSTER_VOLUME_DELETE=Gluster Volume deleted
AuditLogType___GLUSTER_VOLUME_DELETE_FAILED=Gluster Volume could not be deleted
--
To view, visit http://gerrit.ovirt.org/14884
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd53a3f6a0ef671562a510275d6dd54417669545
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shubhendu Tripathi <shtri...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
