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 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/20529/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..2cae56e 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; @@ -11,6 +13,7 @@ import org.ovirt.engine.api.model.Nics; import org.ovirt.engine.api.model.Template; import org.ovirt.engine.api.model.VirtIOSCSI; +import org.ovirt.engine.api.model.WatchDog; import org.ovirt.engine.api.resource.ActionResource; import org.ovirt.engine.api.resource.AssignedPermissionsResource; import org.ovirt.engine.api.resource.CreationResource; @@ -144,7 +147,14 @@ public WatchdogsResource getWatchdogsResource() { return inject(new BackendWatchdogsResource(guid, VdcQueryType.GetWatchdog, - new IdQueryParameters(guid))); + new IdQueryParameters(guid)) { + @Override + public WatchDog addParents(WatchDog device) { + device.setTemplate(new Template()); + device.getTemplate().setId(parentId.toString()); + return device; + } + }); } private List<String> getConsoleDevicesForEntity(Guid id) { -- To view, visit http://gerrit.ovirt.org/20529 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie84c9809a8cbb0fddf0daf39f22be97a8eadb938 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
