|
52 | 52 | import com.cloud.template.TemplateApiService; |
53 | 53 | import com.cloud.template.VirtualMachineTemplate; |
54 | 54 | import com.cloud.user.AccountManager; |
| 55 | +import com.cloud.utils.Pair; |
55 | 56 | import com.cloud.utils.component.ComponentContext; |
56 | 57 | import com.cloud.utils.component.ManagerBase; |
57 | 58 | import com.cloud.utils.db.Filter; |
@@ -111,13 +112,14 @@ private KubernetesSupportedVersionResponse createKubernetesSupportedVersionRespo |
111 | 112 | return response; |
112 | 113 | } |
113 | 114 |
|
114 | | - private ListResponse<KubernetesSupportedVersionResponse> createKubernetesSupportedVersionListResponse(List<KubernetesSupportedVersionVO> versions) { |
| 115 | + private ListResponse<KubernetesSupportedVersionResponse> createKubernetesSupportedVersionListResponse( |
| 116 | + List<KubernetesSupportedVersionVO> versions, Integer count) { |
115 | 117 | List<KubernetesSupportedVersionResponse> responseList = new ArrayList<>(); |
116 | 118 | for (KubernetesSupportedVersionVO version : versions) { |
117 | 119 | responseList.add(createKubernetesSupportedVersionResponse(version)); |
118 | 120 | } |
119 | 121 | ListResponse<KubernetesSupportedVersionResponse> response = new ListResponse<>(); |
120 | | - response.setResponses(responseList); |
| 122 | + response.setResponses(responseList, count); |
121 | 123 | return response; |
122 | 124 | } |
123 | 125 |
|
@@ -272,10 +274,12 @@ public ListResponse<KubernetesSupportedVersionResponse> listKubernetesSupportedV |
272 | 274 | if(keyword != null){ |
273 | 275 | sc.setParameters("keyword", "%" + keyword + "%"); |
274 | 276 | } |
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); |
277 | 281 |
|
278 | | - return createKubernetesSupportedVersionListResponse(versions); |
| 282 | + return createKubernetesSupportedVersionListResponse(versions, versionsAndCount.second()); |
279 | 283 | } |
280 | 284 |
|
281 | 285 | @Override |
|
0 commit comments