Michael Pasternak has uploaded a new change for review. 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 it's addresses two different issues in a same patch (first has +2, second is -2) This reverts commit 0888726b8e5c39cacaefd5af9242513507d86292. Change-Id: I57ff677b72b82def25279b15e2d0c31bf70ffa7b Signed-off-by: Michael Pasternak <[email protected]> --- 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(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/14669/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java index 32344c4..8eb94ef 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResource.java @@ -35,18 +35,8 @@ @Override public Response add(Network network) { validateParameters(network, "name"); //right now, name is mandatory (future - id alone will be enough) - String networkId = getNetworkId(network.getName(), clusterId); - if (networkId == null) { - return handleError(Response.class, new BackendFailureException( - "Bad network name: "+network.getName()), false); - } if (!network.isSetId()) { - network.setId(networkId); - } - else if (!network.getId().equals(networkId)) { - return handleError(Response.class, new BackendFailureException( - "Network id provided does not match the id for network with name: "+ - network.getName()), false); + network.setId(getNetworkId(network.getName(), clusterId)); } org.ovirt.engine.core.common.businessentities.network.Network entity = map(network); return performCreate(addAction, diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResourceTest.java index 7c4c426..06d38a0 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworksResourceTest.java @@ -92,15 +92,19 @@ VDSGroup vdsGroup = setUpVDSGroupExpectations(CLUSTER_ID); setUriInfo(setUpBasicUriExpectations()); - setUpEntityQueryExpectations(1, null); - setUpGetClusterExpectations(); - setUpGetNetworksByDataCenterExpectations(1, null); - setUpActionExpectations(VdcActionType.AttachNetworkToVdsGroup, - AttachNetworkToVdsGroupParameter.class, - new String[] { "VdsGroupId" }, - new Object[] { CLUSTER_ID }, - true, - true); + + setUpCreationExpectations(VdcActionType.AttachNetworkToVdsGroup, + AttachNetworkToVdsGroupParameter.class, + new String[] { "VdsGroupId" }, + new Object[] { CLUSTER_ID }, + true, + true, + null, + VdcQueryType.GetAllNetworksByClusterId, + IdQueryParameters.class, + new String[] { "Id" }, + new Object[] { CLUSTER_ID }, + asList(getEntity(0))); Network model = getModel(0); Response response = collection.add(model); assertEquals(201, response.getStatus()); @@ -119,17 +123,14 @@ } private void doTestBadAddNetwork(boolean canDo, boolean success, String detail) throws Exception { - VDSGroup vdsGroup = setUpVDSGroupExpectations(CLUSTER_ID); + setUpVDSGroupExpectations(CLUSTER_ID); - setUriInfo(setUpBasicUriExpectations()); - setUpGetClusterExpectations(); - setUpGetNetworksByDataCenterExpectations(1, null); - setUpActionExpectations(VdcActionType.AttachNetworkToVdsGroup, - AttachNetworkToVdsGroupParameter.class, - new String[] { "VdsGroupId" }, - new Object[] { CLUSTER_ID }, - canDo, - success); + setUriInfo(setUpActionExpectations(VdcActionType.AttachNetworkToVdsGroup, + AttachNetworkToVdsGroupParameter.class, + new String[] { "VdsGroupId" }, + new Object[] { CLUSTER_ID }, + canDo, + success)); Network model = getModel(0); try { -- To view, visit http://gerrit.ovirt.org/14669 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I57ff677b72b82def25279b15e2d0c31bf70ffa7b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Pasternak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
