Change in ovirt-engine[master]: Revert "restapi : AttachNetworkToVdsGroupCommand HTTP Status...

Michael Pasternak has submitted this change and it was merged. Change subject: Revert "restapi : AttachNetworkToVdsGroupCommand HTTP Status 500 - java.lang.NullPointerException(#961046)" ...................................................................... Revert "restapi : AttachNetworkToVdsGroupCommand HTTP Status 500 - java.lang.NullPointerException(#961046)" Reverting this change since: 38 String networkId = getNetworkId(network.getName(), clusterId); 39 network.setId(getNetworkId(network.getName(), clusterId)); 39 if (networkId == null) { 40 return handleError(Response.class, new BackendFailureException( 41 "Bad network name: "+network.getName()), false); here should be returned 404 error by not found 42 } 43 if (!network.isSetId()) { 44 network.setId(networkId); 45 } 46 else if (!network.getId().equals(networkId)) { 47 return handleError(Response.class, new BackendFailureException( 48 "Network id provided does not match the id for network with name: "+ 49 network.getName()), false); this is backend logic 40 } 50 } This reverts commit 0888726b8e5c39cacaefd5af9242513507d86292. Change-Id: I57ff677b72b82def25279b15e2d0c31bf70ffa7b Signed-off-by: Michael Pasternak <mpastern@redhat.com> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResourceTest.java 2 files changed, 21 insertions(+), 30 deletions(-) Approvals: Michael Pasternak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/14669 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I57ff677b72b82def25279b15e2d0c31bf70ffa7b Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Pasternak <mpastern@redhat.com> Gerrit-Reviewer: Michael Pasternak <mpastern@redhat.com>
participants (1)
-
mpastern@redhat.com