ofri masad has posted comments on this change. Change subject: core: Add mom policy update command ......................................................................
Patch Set 4: (17 inline comments) .................................................... File backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateMomPolicyCommand.java Line 18: Line 19: import java.util.Collections; Line 20: import java.util.List; Line 21: Line 22: public class UpdateMomPolicyCommand extends CommandBase<VdsActionParameters> { I guess you meant @NonTransactiveCommandAttribute Line 23: Line 24: private VDS vds; Line 25: Line 26: public UpdateMomPolicyCommand(VdsActionParameters vdsActionParameters) { Line 27: super(vdsActionParameters); Line 28: } Line 29: Line 30: private boolean runUpdateMomPolicy(final VDS vds, boolean ballooningEnabled) { Line 31: VDSReturnValue returnValue = new VDSReturnValue(); Done Line 32: try { Line 33: returnValue = runVdsCommand(VDSCommandType.SetMOMPolicyParameters, Line 34: new MomPolicyVDSParameters(vds, ballooningEnabled)); Line 35: } catch (VdcBLLException e) { Line 39: } Line 40: Line 41: @Override Line 42: protected void executeCommand() { Line 43: VDSGroup vdsGroup = getVdsGroupDao().get(vds.getVdsGroupId()); Done Line 44: Line 45: if (vdsGroup != null) { Line 46: getReturnValue().setSucceeded(runUpdateMomPolicy(vds, vdsGroup.isEnableBallooning())); Line 47: } Line 41: @Override Line 42: protected void executeCommand() { Line 43: VDSGroup vdsGroup = getVdsGroupDao().get(vds.getVdsGroupId()); Line 44: Line 45: if (vdsGroup != null) { Done Line 46: getReturnValue().setSucceeded(runUpdateMomPolicy(vds, vdsGroup.isEnableBallooning())); Line 47: } Line 48: } Line 49: Line 47: } Line 48: } Line 49: Line 50: @Override Line 51: public String getVdsName() { Done Line 52: return vds == null ? null : vds.getName(); Line 53: } Line 54: Line 55: @Override Line 49: Line 50: @Override Line 51: public String getVdsName() { Line 52: return vds == null ? null : vds.getName(); Line 53: } Done Line 54: Line 55: @Override Line 56: protected boolean canDoAction() { Line 57: if (getParameters().getVdsId() == null) { Line 53: } Line 54: Line 55: @Override Line 56: protected boolean canDoAction() { Line 57: if (getParameters().getVdsId() == null) { you are right. unfortunately, this is not validated in the VdsActionParameters class. since adding this validation to VdsActionParameters will effect many command, i prefer not to add this in this point. the getVds() == null will give us the information we need anyway. Line 58: return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_UPDATE_MOM_POLICY_UPDATE_NULL_HOST); Line 59: } Line 60: Line 61: vds = getVdsDao().get(getParameters().getVdsId()); Line 57: if (getParameters().getVdsId() == null) { Line 58: return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_UPDATE_MOM_POLICY_UPDATE_NULL_HOST); Line 59: } Line 60: Line 61: vds = getVdsDao().get(getParameters().getVdsId()); Done Line 62: Line 63: if (vds == null) { Line 64: return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_UPDATE_MOM_POLICY_UPDATE_NULL_HOST); Line 65: } Line 59: } Line 60: Line 61: vds = getVdsDao().get(getParameters().getVdsId()); Line 62: Line 63: if (vds == null) { Done Line 64: return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_UPDATE_MOM_POLICY_UPDATE_NULL_HOST); Line 65: } Line 66: Line 67: if (vds.getStatus() != VDSStatus.Up) { Line 63: if (vds == null) { Line 64: return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_UPDATE_MOM_POLICY_UPDATE_NULL_HOST); Line 65: } Line 66: Line 67: if (vds.getStatus() != VDSStatus.Up) { Done Line 68: return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_UPDATE_MOM_POLICY_UPDATE_HOST_DOWN); Line 69: } Line 70: return true; Line 71: } Line 69: } Line 70: return true; Line 71: } Line 72: Line 73: protected VdsDAO getVdsDao() { Done Line 74: return getDbFacade().getVdsDao(); Line 75: } Line 76: Line 77: protected VdsGroupDAO getVdsGroupDao() { Line 73: protected VdsDAO getVdsDao() { Line 74: return getDbFacade().getVdsDao(); Line 75: } Line 76: Line 77: protected VdsGroupDAO getVdsGroupDao() { Done Line 78: return getDbFacade().getVdsGroupDao(); Line 79: } Line 80: Line 81: @Override Line 85: } Line 86: Line 87: @Override Line 88: public AuditLogType getAuditLogTypeValue() { Line 89: return getSucceeded() ? AuditLogType.USER_UPDATED_MOM_POLICIES : null; Done Line 90: } Line 85: } Line 86: Line 87: @Override Line 88: public AuditLogType getAuditLogTypeValue() { Line 89: return getSucceeded() ? AuditLogType.USER_UPDATED_MOM_POLICIES : null; the only way the user knows the operation succeeded is by looking at the audit log Line 90: } .................................................... File backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java Line 280: ClearExternalJob(1802, ActionGroup.INJECT_EXTERNAL_TASKS, false, QuotaDependency.NONE), Line 281: AddExternalStep(1803, ActionGroup.INJECT_EXTERNAL_TASKS, false, QuotaDependency.NONE), Line 282: EndExternalStep(1804, ActionGroup.INJECT_EXTERNAL_TASKS, false, QuotaDependency.NONE), Line 283: Line 284: UpdateMomPolicy(1900, ActionGroup.EDIT_HOST_CONFIGURATION, false, QuotaDependency.NONE); Done Line 285: Line 286: private int intValue; Line 287: private ActionGroup actionGroup; Line 288: private boolean isActionMonitored = true; .................................................... File backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java Line 478: severities.put(AuditLogType.USER_UPDATED_NETWORK_QOS, AuditLogSeverity.NORMAL); Line 479: severities.put(AuditLogType.USER_FAILED_TO_UPDATE_NETWORK_QOS, AuditLogSeverity.ERROR); Line 480: } Line 481: Line 482: private static void initMomPoliciesSeverities() { added a second one. more to come in the future Line 483: severities.put(AuditLogType.USER_UPDATED_MOM_POLICIES, AuditLogSeverity.NORMAL); Line 484: } Line 485: Line 486: private static void initVMSeverities() { .................................................... File backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties Line 929: ACTION_TYPE_FAILED_NETWORK_QOS_PEAK_LOWER_THAN_AVERAGE=Cannot ${action} ${type}. Peak cannot be set lower than Average. Line 930: QOS_NAME_NOT_NULL=QoS name cannot be empty. Line 931: QOS_NAME_INVALID=Invalid QoS name (name must be formed of "a-z0-9A-Z" or "-_ ") Line 932: QOS_NAME_TOO_LONG=QoS name length must be under 255 characters. Line 933: ACTION_TYPE_FAILED_UPDATE_MOM_POLICY_UPDATE_HOST_DOWN=Cannot update host's mom policy. Host is not running. Done Line 934: ACTION_TYPE_FAILED_UPDATE_MOM_POLICY_UPDATE_NULL_HOST=Cannot update host's mom policy. Host is null. Line 935: Line 936: # cluster policy errors Line 937: ACTION_TYPE_FAILED_CLUSTER_POLICY_PARAMETERS_INVALID=Cannot ${action} ${type}. Parameters are invalid. -- To view, visit http://gerrit.ovirt.org/17379 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I64350c17f182c1dd0ba1d06130e5d56019b32fc9 Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: ofri masad <oma...@redhat.com> Gerrit-Reviewer: Allon Mureinik <amure...@redhat.com> Gerrit-Reviewer: Doron Fediuck <dfedi...@redhat.com> Gerrit-Reviewer: Gilad Chaplik <gchap...@redhat.com> Gerrit-Reviewer: Martin Sivák <msi...@redhat.com> Gerrit-Reviewer: Mike Kolesnik <mkole...@redhat.com> Gerrit-Reviewer: Roy Golan <rgo...@redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-Reviewer: ofri masad <oma...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches