Libor Spevak has uploaded a new change for review. Change subject: restapi: Do not send ticket back in case of operation error ......................................................................
restapi: Do not send ticket back in case of operation error Do not return a ticket using REST API if operation fails, e.g. user doesn't have permission to VM Change-Id: I8bc4d0c6ed48005978d333d28c7bec66d076c511 Bug-Url: https://bugzilla.redhat.com/867920 Signed-off-by: Libor Spevak <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java 1 file changed, 15 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/97/9997/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java index 43d3704..4724b63 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java @@ -17,6 +17,7 @@ import org.ovirt.engine.api.model.CdRom; import org.ovirt.engine.api.model.CdRoms; import org.ovirt.engine.api.model.Certificate; +import org.ovirt.engine.api.model.CreationStatus; import org.ovirt.engine.api.model.Display; import org.ovirt.engine.api.model.MemoryPolicy; import org.ovirt.engine.api.model.Statistic; @@ -303,11 +304,20 @@ @Override public Response ticket(Action action) { - return doAction(VdcActionType.SetVmTicket, - new SetVmTicketParameters(guid, - getTicketValue(action), - getTicketExpiry(action)), - action); + final Response response = doAction(VdcActionType.SetVmTicket, + new SetVmTicketParameters(guid, + getTicketValue(action), + getTicketExpiry(action)), + action); + + final Action actionResponse = (Action) response.getEntity(); + + if (CreationStatus.FAILED.value().equals(actionResponse.getStatus().getState())) { + actionResponse.getTicket().setValue(null); + actionResponse.getTicket().setExpiry(null); + } + + return response; } protected String getTicketValue(Action action) { -- To view, visit http://gerrit.ovirt.org/9997 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8bc4d0c6ed48005978d333d28c7bec66d076c511 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Libor Spevak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
