Moti Asayag has uploaded a new change for review. Change subject: engine: Introduce VnicProfileCommon class ......................................................................
engine: Introduce VnicProfileCommon class The VnicProfileCommon class is the base class of the vnic profile related commands in the system: add, update and remove. Change-Id: I71debdb5fe5dc42b308ccd8bd3e177191f9d2a3a Signed-off-by: Moti Asayag <[email protected]> --- A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/VnicProfileCommon.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 6 files changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/73/16673/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/VnicProfileCommon.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/VnicProfileCommon.java new file mode 100644 index 0000000..1d3a389 --- /dev/null +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/VnicProfileCommon.java @@ -0,0 +1,36 @@ +package org.ovirt.engine.core.bll.network.vm; + +import java.util.Collections; +import java.util.List; + +import org.ovirt.engine.core.bll.CommandBase; +import org.ovirt.engine.core.bll.utils.PermissionSubject; +import org.ovirt.engine.core.common.VdcObjectType; +import org.ovirt.engine.core.common.action.VnicProfileParameters; +import org.ovirt.engine.core.common.businessentities.network.VnicProfile; +import org.ovirt.engine.core.common.errors.VdcBllMessages; +import org.ovirt.engine.core.compat.Guid; + +public abstract class VnicProfileCommon<T extends VnicProfileParameters> extends CommandBase<T> { + public VnicProfileCommon(T parameters) { + super(parameters); + } + + protected VnicProfile getVnicProfile() { + return getParameters().getVnicProfile(); + } + + @Override + protected void setActionMessageParameters() { + addCanDoActionMessage(VdcBllMessages.VAR__TYPE__VNIC_PROFILE); + } + + @Override + public List<PermissionSubject> getPermissionCheckSubjects() { + Guid vnicProfileId = getVnicProfile() == null ? null : getVnicProfile().getId(); + + return Collections.singletonList(new PermissionSubject(vnicProfileId, + VdcObjectType.VnicProfile, + getActionType().getActionGroup())); + } +} 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 a381699..9679245 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 @@ -21,6 +21,7 @@ VAR__TYPE__INTERFACE, VAR__TYPE__NETWORK, VAR__TYPE__NETWORKS, + VAR__TYPE__VNIC_PROFILE, VAR__TYPE__PROVIDER, VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN, VAR__TYPE__VM_DISK, 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 91a4bc5..0f8d9ac 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -212,6 +212,7 @@ VAR__ENTITIES__HOSTS=$entities hosts VAR__TYPE__NETWORK=$type Network VAR__TYPE__NETWORKS=$type Networks +VAR__TYPE__VAR__TYPE_VNIC_PROFILE=$type Vm network interface profile VAR__TYPE__PROVIDER=$type provider VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type provider certificate chain VAR__TYPE__VM=$type VM 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 22d280f..1c4f388 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 @@ -565,6 +565,9 @@ @DefaultStringValue("$type Network") String VAR__TYPE__NETWORK(); + @DefaultStringValue("$type Vm network interface profile") + String VAR__TYPE__VAR__TYPE_VNIC_PROFILE(); + @DefaultStringValue("$type provider") String VAR__TYPE__PROVIDER(); 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 aaa675a..e9b5835 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 @@ -212,6 +212,7 @@ VAR__ENTITIES__HOSTS=$entities hosts VAR__TYPE__NETWORK=$type Network VAR__TYPE__NETWORKS=$type Networks +VAR__TYPE__VAR__TYPE_VNIC_PROFILE=$type Vm network interface profile VAR__TYPE__PROVIDER=$type provider VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type provider certificate chain VAR__TYPE__VM=$type VM 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 7cb18b2..9dd1d6e 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 @@ -208,6 +208,7 @@ VAR__ENTITIES__HOSTS=$entities hosts VAR__TYPE__NETWORK=$type Network VAR__TYPE__NETWORKS=$type Networks +VAR__TYPE__VAR__TYPE_VNIC_PROFILE=$type Vm network interface profile VAR__TYPE__PROVIDER=$type provider VAR__TYPE__PROVIDER_CERTIFICATE_CHAIN=$type provider certificate chain VAR__TYPE__VM=$type VM -- To view, visit http://gerrit.ovirt.org/16673 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I71debdb5fe5dc42b308ccd8bd3e177191f9d2a3a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
