Mike Kolesnik has uploaded a new change for review. Change subject: restapi: Don't raise 404 if slave not found ......................................................................
restapi: Don't raise 404 if slave not found If slave wasn't found, then just map without template, otherwise the 404 is not clear when thrown in the context of setup networks. Change-Id: I20c86e56b102e4c6318608f8d4ba50757fcce12f Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Mike Kolesnik <mkole...@redhat.com> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/8490/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java index 20f6f82..6fe6486 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java @@ -119,13 +119,26 @@ return notFound(); } + /** + * Look for the interface by ID, and raise an error if the interface was not found. + * + * @param id + * The ID of the interface to look for. + * @return The interface. + */ public VdsNetworkInterface lookupInterface(String id) { + VdsNetworkInterface iface = lookupInterfaceById(id); + + return iface == null ? entityNotFound() : iface; + } + + private VdsNetworkInterface lookupInterfaceById(String id) { for (VdsNetworkInterface iface : getCollection()) { if (iface.getId().toString().equals(id)) { return iface; } } - return entityNotFound(); + return null; } protected VdsNetworkInterface lookupInterfaceByName(String name) { @@ -354,7 +367,7 @@ if (nic.isSetBonding() && nic.getBonding().isSetSlaves()) { for (HostNIC slave : nic.getBonding().getSlaves().getSlaves()) { VdsNetworkInterface slaveIface = map(slave, slave.getId() == null - ? lookupInterfaceByName(slave.getName()) : lookupInterface(slave.getId())); + ? lookupInterfaceByName(slave.getName()) : lookupInterfaceById(slave.getId())); slaveIface.setBondName(nic.getName()); ifaces.add(slaveIface); } -- To view, visit http://gerrit.ovirt.org/8490 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I20c86e56b102e4c6318608f8d4ba50757fcce12f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
