Gilad Chaplik has uploaded a new change for review. Change subject: restapi: fix vm link for template's watchdog ......................................................................
restapi: fix vm link for template's watchdog Change-Id: Ie84c9809a8cbb0fddf0daf39f22be97a8eadb938 Bug-Url: https://bugzilla.redhat.com/1019211 Signed-off-by: Gilad Chaplik <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java A backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateWatchdogsResource.java 2 files changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/20708/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java index 11277d7..5118653 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResource.java @@ -2,7 +2,9 @@ import java.util.List; + import javax.ws.rs.core.Response; + import org.ovirt.engine.api.model.Action; import org.ovirt.engine.api.model.CdRom; import org.ovirt.engine.api.model.CdRoms; @@ -142,7 +144,7 @@ @Override @SingleEntityResource public WatchdogsResource getWatchdogsResource() { - return inject(new BackendWatchdogsResource(guid, + return inject(new BackendTemplateWatchdogsResource(guid, VdcQueryType.GetWatchdog, new IdQueryParameters(guid))); } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateWatchdogsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateWatchdogsResource.java new file mode 100644 index 0000000..f56cb78 --- /dev/null +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTemplateWatchdogsResource.java @@ -0,0 +1,22 @@ +package org.ovirt.engine.api.restapi.resource; + +import org.ovirt.engine.api.model.Template; +import org.ovirt.engine.api.model.WatchDog; +import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; +import org.ovirt.engine.core.common.queries.VdcQueryType; +import org.ovirt.engine.core.compat.Guid; + +public class BackendTemplateWatchdogsResource extends BackendWatchdogsResource { + + public BackendTemplateWatchdogsResource(Guid parentId, VdcQueryType queryType, VdcQueryParametersBase queryParams) { + super(parentId, queryType, queryParams); + } + + @Override + public WatchDog addParents(WatchDog device) { + device.setTemplate(new Template()); + device.getTemplate().setId(parentId.toString()); + return device; + } + +} -- To view, visit http://gerrit.ovirt.org/20708 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie84c9809a8cbb0fddf0daf39f22be97a8eadb938 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
