Moti Asayag has uploaded a new change for review. Change subject: restapi: Reduce backend calls for DC network list ......................................................................
restapi: Reduce backend calls for DC network list In case user provides both ID and Name for the network to be attached to a cluster, same networks list returned by querying the backend could be reused. Change-Id: Icf65412ace7b5e2da44af9d9288362ab08505129 Signed-off-by: Moti Asayag <[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, 16 insertions(+), 11 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/14780/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 e1f0b3f..b05ed59 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 @@ -25,6 +25,7 @@ implements AssignedNetworksResource { private String clusterId; + private List<org.ovirt.engine.core.common.businessentities.network.Network> networks; public BackendClusterNetworksResource(String clusterId) { super(VdcQueryType.GetAllNetworksByClusterId, @@ -125,13 +126,17 @@ } private List<org.ovirt.engine.core.common.businessentities.network.Network> getNetworks(String clusterId) { - NGuid dataCenterId = - getEntity(VDSGroup.class, - VdcQueryType.GetVdsGroupById, - new GetVdsGroupByIdParameters(asGuid(clusterId)), - null).getStoragePoolId(); - IdQueryParameters params = new IdQueryParameters(asGuid(dataCenterId)); - return getBackendCollection(VdcQueryType.GetAllNetworks, params); + if (networks == null) { + NGuid dataCenterId = + getEntity(VDSGroup.class, + VdcQueryType.GetVdsGroupById, + new GetVdsGroupByIdParameters(asGuid(clusterId)), + null).getStoragePoolId(); + IdQueryParameters params = new IdQueryParameters(asGuid(dataCenterId)); + networks = getBackendCollection(VdcQueryType.GetAllNetworks, params); + } + + return networks; } @Override 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 61e0754..355df05 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 @@ -93,8 +93,8 @@ setUriInfo(setUpBasicUriExpectations()); setUpEntityQueryExpectations(1, null); - setUpGetClusterExpectations(2, null); - setUpGetNetworksByDataCenterExpectations(2, null); + setUpGetClusterExpectations(1, null); + setUpGetNetworksByDataCenterExpectations(1, null); setUpActionExpectations(VdcActionType.AttachNetworkToVdsGroup, AttachNetworkToVdsGroupParameter.class, new String[] { "VdsGroupId" }, @@ -122,8 +122,8 @@ setUpVDSGroupExpectations(CLUSTER_ID); setUriInfo(setUpBasicUriExpectations()); - setUpGetClusterExpectations(2, null); - setUpGetNetworksByDataCenterExpectations(2, null); + setUpGetClusterExpectations(1, null); + setUpGetNetworksByDataCenterExpectations(1, null); setUpActionExpectations(VdcActionType.AttachNetworkToVdsGroup, AttachNetworkToVdsGroupParameter.class, new String[] { "VdsGroupId" }, -- To view, visit http://gerrit.ovirt.org/14780 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icf65412ace7b5e2da44af9d9288362ab08505129 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
