Tomer Saban has uploaded a new change for review. Change subject: core: Fixed missing type variable in disk profiles ......................................................................
core: Fixed missing type variable in disk profiles Fixed the missing type variable in disk profiles. Also, fixed the bug for cpu profiles. Added variable VAR__TYPE__DISK__PROFILE. Change-Id: I1f7500b557ada1ed78aa6d736018a5319142cd58 Bug-Url: https://bugzilla.redhat.com/1142887 Signed-off-by: Tomer Saban <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddCpuProfileCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddDiskProfileCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddProfileCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveCpuProfileCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveDiskProfileCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveProfileCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateCpuProfileCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateDiskProfileCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateProfileCommandBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties 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 14 files changed, 41 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/33274/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddCpuProfileCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddCpuProfileCommand.java index 87bb143..4a1a6fa 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddCpuProfileCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddCpuProfileCommand.java @@ -39,7 +39,7 @@ @Override protected void setActionMessageParameters() { super.setActionMessageParameters(); - addCanDoActionMessage(VdcBllMessages.VAR__ACTION__ADD); + addCanDoActionMessage(VdcBllMessages.VAR__TYPE__CPU__PROFILE); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddDiskProfileCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddDiskProfileCommand.java index 2f801fe..d9a633b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddDiskProfileCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddDiskProfileCommand.java @@ -38,7 +38,7 @@ @Override protected void setActionMessageParameters() { super.setActionMessageParameters(); - addCanDoActionMessage(VdcBllMessages.VAR__ACTION__ADD); + addCanDoActionMessage(VdcBllMessages.VAR__TYPE__DISK__PROFILE); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddProfileCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddProfileCommandBase.java index ea45bc3..7d70059 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddProfileCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddProfileCommandBase.java @@ -2,6 +2,7 @@ import org.ovirt.engine.core.common.action.ProfileParametersBase; import org.ovirt.engine.core.common.businessentities.profiles.ProfileBase; +import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.compat.Guid; public abstract class AddProfileCommandBase<T extends ProfileParametersBase<P>, P extends ProfileBase, Q extends ProfileValidator<P>> extends ProfileCommandBase<T, P> { @@ -27,5 +28,11 @@ setSucceeded(true); } + @Override + protected void setActionMessageParameters() { + super.setActionMessageParameters(); + addCanDoActionMessage(VdcBllMessages.VAR__ACTION__ADD); + } + protected abstract Q getProfileValidator(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveCpuProfileCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveCpuProfileCommand.java index bdfb7e8..93a5c26 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveCpuProfileCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveCpuProfileCommand.java @@ -36,7 +36,7 @@ @Override protected void setActionMessageParameters() { super.setActionMessageParameters(); - addCanDoActionMessage(VdcBllMessages.VAR__ACTION__REMOVE); + addCanDoActionMessage(VdcBllMessages.VAR__TYPE__CPU__PROFILE); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveDiskProfileCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveDiskProfileCommand.java index a8e6e8f..3a50331 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveDiskProfileCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveDiskProfileCommand.java @@ -36,7 +36,7 @@ @Override protected void setActionMessageParameters() { super.setActionMessageParameters(); - addCanDoActionMessage(VdcBllMessages.VAR__ACTION__REMOVE); + addCanDoActionMessage(VdcBllMessages.VAR__TYPE__DISK__PROFILE); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveProfileCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveProfileCommandBase.java index 6962a2e..cda3b6e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveProfileCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/RemoveProfileCommandBase.java @@ -2,6 +2,7 @@ import org.ovirt.engine.core.common.action.ProfileParametersBase; import org.ovirt.engine.core.common.businessentities.profiles.ProfileBase; +import org.ovirt.engine.core.common.errors.VdcBllMessages; public abstract class RemoveProfileCommandBase<T extends ProfileParametersBase<P>, P extends ProfileBase, Q extends ProfileValidator<P>> extends ProfileCommandBase<T, P> { @@ -23,5 +24,11 @@ setSucceeded(true); } + @Override + protected void setActionMessageParameters() { + super.setActionMessageParameters(); + addCanDoActionMessage(VdcBllMessages.VAR__ACTION__REMOVE); + } + protected abstract Q getProfileValidator(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateCpuProfileCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateCpuProfileCommand.java index 9e419a6..3268df3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateCpuProfileCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateCpuProfileCommand.java @@ -36,7 +36,7 @@ @Override protected void setActionMessageParameters() { super.setActionMessageParameters(); - addCanDoActionMessage(VdcBllMessages.VAR__ACTION__UPDATE); + addCanDoActionMessage(VdcBllMessages.VAR__TYPE__CPU__PROFILE); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateDiskProfileCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateDiskProfileCommand.java index 247ea26..0a2835e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateDiskProfileCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateDiskProfileCommand.java @@ -36,7 +36,7 @@ @Override protected void setActionMessageParameters() { super.setActionMessageParameters(); - addCanDoActionMessage(VdcBllMessages.VAR__ACTION__UPDATE); + addCanDoActionMessage(VdcBllMessages.VAR__TYPE__DISK__PROFILE); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateProfileCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateProfileCommandBase.java index b208b82..b584a3e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateProfileCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/UpdateProfileCommandBase.java @@ -2,6 +2,7 @@ import org.ovirt.engine.core.common.action.ProfileParametersBase; import org.ovirt.engine.core.common.businessentities.profiles.ProfileBase; +import org.ovirt.engine.core.common.errors.VdcBllMessages; public abstract class UpdateProfileCommandBase<T extends ProfileParametersBase<P>, P extends ProfileBase, Q extends ProfileValidator<P>> extends ProfileCommandBase<T, P> { @@ -26,5 +27,11 @@ setSucceeded(true); } + @Override + protected void setActionMessageParameters() { + super.setActionMessageParameters(); + addCanDoActionMessage(VdcBllMessages.VAR__ACTION__UPDATE); + } + protected abstract Q getProfileValidator(); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java index db7c172..58884d5 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java @@ -38,6 +38,8 @@ VAR__TYPE__AFFINITY_GROUP, VAR__TYPE__ISCSI_BOND, VAR__TYPE__DISK__SNAPSHOT, + VAR__TYPE__DISK__PROFILE, + VAR__TYPE__CPU__PROFILE, // Gluster types VAR__TYPE__GLUSTER_VOLUME, 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 a68ea3c..eb6e2ed 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -311,6 +311,8 @@ VAR__TYPE__AFFINITY_GROUP=$type Affinity Group VAR__TYPE__ISCSI_BOND=$type iSCSI Bond VAR__TYPE__DISK__SNAPSHOT=$type Disk Snapshot +VAR__TYPE__DISK__PROFILE=$type Disk Profile +VAR__TYPE__CPU__PROFILE=$type Cpu Profile VAR__ACTION__RUN=$action run VAR__ACTION__REMOVE=$action remove VAR__ACTION__ADD=$action add 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 5d6c3bb..872efb8 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 @@ -850,6 +850,12 @@ @DefaultStringValue("$type Disk Snapshot") String VAR__TYPE__DISK__SNAPSHOT(); + @DefaultStringValue("$type Disk Profile") + String VAR__TYPE__DISK__PROFILE(); + + @DefaultStringValue("$type Cpu Profile") + String VAR__TYPE__CPU__PROFILE(); + @DefaultStringValue("$action run") String VAR__ACTION__RUN(); 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 315735c..25a761d 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 @@ -289,6 +289,8 @@ VAR__TYPE__HOST_CAPABILITIES=$type Host capabilities VAR__TYPE__ISCSI_BOND=$type iSCSI Bond VAR__TYPE__DISK__SNAPSHOT=$type Disk Snapshot +VAR__TYPE__DISK__PROFILE=$type Disk Profile +VAR__TYPE__CPU__PROFILE=$type Cpu Profile VAR__ACTION__RUN=$action run VAR__ACTION__REMOVE=$action remove VAR__ACTION__ADD=$action add 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 ef25b07..525b9df 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 @@ -316,6 +316,8 @@ VAR__TYPE__SPM=$type SPM VAR__TYPE__ISCSI_BOND=$type iSCSI Bond VAR__TYPE__DISK__SNAPSHOT=$type Disk Snapshot +VAR__TYPE__DISK__PROFILE=$type Disk Profile +VAR__TYPE__CPU__PROFILE=$type Cpu Profile VAR__ACTION__RUN=$action run VAR__ACTION__REMOVE=$action remove VAR__ACTION__ADD=$action add -- To view, visit http://gerrit.ovirt.org/33274 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f7500b557ada1ed78aa6d736018a5319142cd58 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomer Saban <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
