Skip to content

Commit dd3019c

Browse files
committed
cks: fix list apis count
Fixes count value in listKubernetesClusters and listSupportedKubernetesVersions APIs response. Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
1 parent cadbb56 commit dd3019c

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,13 +1486,13 @@ public ListResponse<KubernetesClusterResponse> listKubernetesClusters(ListKubern
14861486
if (clusterType != null) {
14871487
sc.setParameters("cluster_type", clusterType);
14881488
}
1489-
List<KubernetesClusterVO> kubernetesClusters = kubernetesClusterDao.search(sc, searchFilter);
1490-
for (KubernetesClusterVO cluster : kubernetesClusters) {
1489+
Pair<List<KubernetesClusterVO>, Integer> kubernetesClustersAndCount = kubernetesClusterDao.searchAndCount(sc, searchFilter);
1490+
for (KubernetesClusterVO cluster : kubernetesClustersAndCount.first()) {
14911491
KubernetesClusterResponse clusterResponse = createKubernetesClusterResponse(cluster.getId());
14921492
responsesList.add(clusterResponse);
14931493
}
1494-
ListResponse<KubernetesClusterResponse> response = new ListResponse<KubernetesClusterResponse>();
1495-
response.setResponses(responsesList);
1494+
ListResponse<KubernetesClusterResponse> response = new ListResponse<>();
1495+
response.setResponses(responsesList, kubernetesClustersAndCount.second());
14961496
return response;
14971497
}
14981498

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/version/KubernetesVersionManagerImpl.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
import com.cloud.template.TemplateApiService;
5353
import com.cloud.template.VirtualMachineTemplate;
5454
import com.cloud.user.AccountManager;
55+
import com.cloud.utils.Pair;
5556
import com.cloud.utils.component.ComponentContext;
5657
import com.cloud.utils.component.ManagerBase;
5758
import com.cloud.utils.db.Filter;
@@ -111,13 +112,14 @@ private KubernetesSupportedVersionResponse createKubernetesSupportedVersionRespo
111112
return response;
112113
}
113114

114-
private ListResponse<KubernetesSupportedVersionResponse> createKubernetesSupportedVersionListResponse(List<KubernetesSupportedVersionVO> versions) {
115+
private ListResponse<KubernetesSupportedVersionResponse> createKubernetesSupportedVersionListResponse(
116+
List<KubernetesSupportedVersionVO> versions, Integer count) {
115117
List<KubernetesSupportedVersionResponse> responseList = new ArrayList<>();
116118
for (KubernetesSupportedVersionVO version : versions) {
117119
responseList.add(createKubernetesSupportedVersionResponse(version));
118120
}
119121
ListResponse<KubernetesSupportedVersionResponse> response = new ListResponse<>();
120-
response.setResponses(responseList);
122+
response.setResponses(responseList, count);
121123
return response;
122124
}
123125

@@ -272,10 +274,12 @@ public ListResponse<KubernetesSupportedVersionResponse> listKubernetesSupportedV
272274
if(keyword != null){
273275
sc.setParameters("keyword", "%" + keyword + "%");
274276
}
275-
List <KubernetesSupportedVersionVO> versions = kubernetesSupportedVersionDao.search(sc, searchFilter);
276-
versions = filterKubernetesSupportedVersions(versions, minimumSemanticVersion);
277+
Pair<List<KubernetesSupportedVersionVO>, Integer> versionsAndCount =
278+
kubernetesSupportedVersionDao.searchAndCount(sc, searchFilter);
279+
List<KubernetesSupportedVersionVO> versions =
280+
filterKubernetesSupportedVersions(versionsAndCount.first(), minimumSemanticVersion);
277281

278-
return createKubernetesSupportedVersionListResponse(versions);
282+
return createKubernetesSupportedVersionListResponse(versions, versionsAndCount.second());
279283
}
280284

281285
@Override

0 commit comments

Comments
 (0)