Piotr Kliczewski has uploaded a new change for review. Change subject: rest: Validation of the protocol values ......................................................................
rest: Validation of the protocol values We did not check protocol values provided so update of the host with wrong protocol string failed on backend whereas it should fail during initial validation. Change-Id: I666b5469bcaf2bd00f793ad4320c3f37505d49b0 Signed-off-by: pkliczewski <piotr.kliczew...@gmail.com> Bug-Url: https://bugzilla.redhat.com/1170125 --- A backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/VdsProtocol.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/HostValidator.java 2 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/65/35865/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/VdsProtocol.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/VdsProtocol.java new file mode 100644 index 0000000..dcc26e8 --- /dev/null +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/VdsProtocol.java @@ -0,0 +1,19 @@ +package org.ovirt.engine.api.model; + +public enum VdsProtocol { + XML, + STOMP, + AMQP; + + public String value() { + return name().toLowerCase(); + } + + public static VdsProtocol fromValue(String value) { + try { + return valueOf(value.toUpperCase()); + } catch (IllegalArgumentException e) { + return null; + } + } +} diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/HostValidator.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/HostValidator.java index 27817df..5d3c56a 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/HostValidator.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/HostValidator.java @@ -5,6 +5,7 @@ import org.ovirt.engine.api.model.Host; import org.ovirt.engine.api.model.PmProxy; import org.ovirt.engine.api.model.PmProxyType; +import org.ovirt.engine.api.model.VdsProtocol; @ValidatedClass(clazz = Host.class) public class HostValidator implements Validator<Host> { @@ -22,5 +23,8 @@ if (host.isSetSsh()) { sshValidator.validateEnums(host.getSsh()); } + if (host.isSetProtocol()) { + validateEnum(VdsProtocol.class, host.getProtocol(), true); + } } } -- To view, visit http://gerrit.ovirt.org/35865 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I666b5469bcaf2bd00f793ad4320c3f37505d49b0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <piotr.kliczew...@gmail.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
