fix

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

api/src/main/java/org/apache/cloudstack/api/ResponseGenerator.java

@@ -578,5 +578,5 @@ List<TemplateResponse> createTemplateResponses(ResponseView view, VirtualMachine
 
     SharedFSResponse createSharedFSResponse(ResponseView view, SharedFS sharedFS);
 
-    void updateTemplateIsoResponsesForIcons(List<TemplateResponse> responses);
+    void updateTemplateIsoResponsesForIcons(List<TemplateResponse> responses, ResourceTag.ResourceObjectType type);
 }

api/src/main/java/org/apache/cloudstack/api/command/user/iso/ListIsosCmd.java

@@ -31,6 +31,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import com.cloud.cpu.CPU;
+import com.cloud.server.ResourceTag;
 import com.cloud.template.VirtualMachineTemplate.TemplateFilter;
 import com.cloud.user.Account;
 
@@ -195,7 +196,8 @@ public ApiCommandResourceType getApiResourceType() {
     public void execute() {
         ListResponse<TemplateResponse> response = _queryService.listIsos(this);
         if (response != null && getShowIcon()) {
-            _responseGenerator.updateTemplateIsoResponsesForIcons(response.getResponses());
+            _responseGenerator.updateTemplateIsoResponsesForIcons(response.getResponses(),
+                    ResourceTag.ResourceObjectType.ISO);
         }
         response.setResponseName(getCommandName());
         setResponseObject(response);

api/src/main/java/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java

@@ -38,6 +38,7 @@
 
 import com.cloud.cpu.CPU;
 import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.server.ResourceTag;
 import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.template.VirtualMachineTemplate.TemplateFilter;
 import com.cloud.user.Account;
@@ -226,7 +227,8 @@ public ApiCommandResourceType getApiResourceType() {
     public void execute() {
         ListResponse<TemplateResponse> response = _queryService.listTemplates(this);
         if (response != null && getShowIcon()) {
-            _responseGenerator.updateTemplateIsoResponsesForIcons(response.getResponses());
+            _responseGenerator.updateTemplateIsoResponsesForIcons(response.getResponses(),
+                    ResourceTag.ResourceObjectType.Template);
         }
         response.setResponseName(getCommandName());
         setResponseObject(response);

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -5525,12 +5525,13 @@ protected Map<String, ResourceIcon> getResourceIconsUsingOsCategory(List<Templat
     }
 
     @Override
-    public void updateTemplateIsoResponsesForIcons(List<TemplateResponse> responses) {
+    public void updateTemplateIsoResponsesForIcons(List<TemplateResponse> responses,
+                   ResourceTag.ResourceObjectType type) {
         if (CollectionUtils.isEmpty(responses)) {
             return;
         }
         Set<String> uuids = responses.stream().map(TemplateResponse::getId).collect(Collectors.toSet());
-        Map<String, ResourceIcon> templateIcons = resourceIconManager.getByResourceTypeAndUuids(ResourceTag.ResourceObjectType.ISO, uuids);
+        Map<String, ResourceIcon> templateIcons = resourceIconManager.getByResourceTypeAndUuids(type, uuids);
         List<TemplateResponse> noTemplateIconResponses = responses
                 .stream()
                 .filter(r -> !templateIcons.containsKey(r.getId()))

server/src/test/java/com/cloud/api/ApiResponseHelperTest.java

@@ -619,14 +619,16 @@ public void testUpdateTemplateIsoResponsesForIcons_withMixedIcons() {
         ResourceIconResponse iconResponse2 = new ResourceIconResponse();
         Mockito.doReturn(iconResponse1).when(apiResponseHelper).createResourceIconResponse(isoIcons.get("t1"));
         Mockito.doReturn(iconResponse2).when(apiResponseHelper).createResourceIconResponse(fallbackIcons.get("t2"));
-        apiResponseHelper.updateTemplateIsoResponsesForIcons(responses);
+        apiResponseHelper.updateTemplateIsoResponsesForIcons(responses, ResourceTag.ResourceObjectType.ISO);
         verify(template1).setResourceIconResponse(iconResponse1);
         verify(template2).setResourceIconResponse(iconResponse2);
     }
 
     @Test
     public void testUpdateTemplateIsoResponsesForIcons_emptyInput() {
-        apiResponseHelper.updateTemplateIsoResponsesForIcons(Collections.emptyList());
-        Mockito.verify(resourceIconManager, Mockito.never()).getByResourceTypeAndUuids(Mockito.any(), Mockito.anyCollection());
+        apiResponseHelper.updateTemplateIsoResponsesForIcons(Collections.emptyList(),
+                ResourceTag.ResourceObjectType.Template);
+        Mockito.verify(resourceIconManager, Mockito.never()).getByResourceTypeAndUuids(Mockito.any(),
+                Mockito.anyCollection());
     }
 }