Oved Ourfali has uploaded a new change for review. Change subject: restapi: removing unsupported resources from root api resource (#869334) ......................................................................
restapi: removing unsupported resources from root api resource (#869334) https://bugzilla.redhat.com/869334 When using User-level API (filtered request), we shouldn't show the user resources that are currently not-supported for users. This patch adds only links for resources that are supported for users, when the response is filtered. If the response isn't filtered, all the links are shown. Change-Id: I2af596b41a20d8b3291634b24ed4ad916575dc10 Signed-off-by: Oved Ourfali <oourf...@redhat.com> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java 1 file changed, 24 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/8781/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java index f61423d..369f691 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java @@ -92,22 +92,24 @@ private Collection<DetailedLink> getLinks() { Collection<DetailedLink> links = new LinkedList<DetailedLink>(); - links.add(createLink("capabilities")); - links.add(createLink("clusters", LinkFlags.SEARCHABLE)); - links.add(createLink("datacenters", LinkFlags.SEARCHABLE)); - links.add(createLink("events", LinkFlags.SEARCHABLE, getEventParams())); - links.add(createLink("hosts", LinkFlags.SEARCHABLE)); - links.add(createLink("networks")); - links.add(createLink("roles")); - links.add(createLink("storagedomains", LinkFlags.SEARCHABLE)); - links.add(createLink("tags")); - links.add(createLink("templates", LinkFlags.SEARCHABLE)); - links.add(createLink("users", LinkFlags.SEARCHABLE)); - links.add(createLink("groups", LinkFlags.SEARCHABLE)); - links.add(createLink("domains")); - links.add(createLink("vmpools", LinkFlags.SEARCHABLE)); - links.add(createLink("vms", LinkFlags.SEARCHABLE)); - links.add(createLink("disks", LinkFlags.SEARCHABLE)); + + addLink(links, createLink("capabilities"), true); + addLink(links, createLink("clusters", LinkFlags.SEARCHABLE), true); + addLink(links, createLink("datacenters", LinkFlags.SEARCHABLE), true); + addLink(links, createLink("events", LinkFlags.SEARCHABLE, getEventParams()), false); + addLink(links, createLink("hosts", LinkFlags.SEARCHABLE), false); + addLink(links, createLink("networks"), false); + addLink(links, createLink("roles"), true); + addLink(links, createLink("storagedomains", LinkFlags.SEARCHABLE), true); + addLink(links, createLink("tags"), false); + addLink(links, createLink("templates", LinkFlags.SEARCHABLE), true); + addLink(links, createLink("users", LinkFlags.SEARCHABLE), false); + addLink(links, createLink("groups", LinkFlags.SEARCHABLE), false); + addLink(links, createLink("domains"), true); + addLink(links, createLink("vmpools", LinkFlags.SEARCHABLE), false); + addLink(links, createLink("vms", LinkFlags.SEARCHABLE), true); + addLink(links, createLink("disks", LinkFlags.SEARCHABLE), false); + return links; } @@ -126,6 +128,12 @@ return links; } + private void addLink(Collection<DetailedLink> links, DetailedLink link, boolean addToFiltered) { + if (!isFiltered() || addToFiltered) { + links.add(link); + } + } + private Link createBlankTemplateLink() { Link link = new Link(); link.setRel("templates/blank"); -- To view, visit http://gerrit.ovirt.org/8781 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2af596b41a20d8b3291634b24ed4ad916575dc10 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Oved Ourfali <oourf...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
