Sort instead of filtering by preferred arch

Author: nvazquez

engine/schema/src/main/java/com/cloud/storage/dao/VMTemplateDaoImpl.java

@@ -585,12 +585,12 @@ public VMTemplateVO findSystemVMReadyTemplate(long zoneId, HypervisorType hyperv
             return null;
         }
         if (StringUtils.isNotBlank(preferredArch)) {
+            // Sort the templates by preferred architecture first
             templates = templates.stream()
-                    .filter(x -> x.getArch().getType().equalsIgnoreCase(preferredArch))
+                    .sorted(Comparator.comparing(
+                            x -> !x.getArch().getType().equalsIgnoreCase(preferredArch)
+                    ))
                     .collect(Collectors.toList());
-            if (CollectionUtils.isEmpty(templates)) {
-                return null;
-            }
         }
         if (hypervisorType == HypervisorType.Any) {
             return templates.get(0);

engine/schema/src/test/java/com/cloud/storage/dao/VMTemplateDaoImplTest.java

@@ -31,6 +31,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -186,4 +187,26 @@ public void testFindLatestTemplateByTypeAndHypervisorAndArch_NotFound() {
         VMTemplateVO result = templateDao.findLatestTemplateByTypeAndHypervisorAndArch(hypervisorType, arch, type);
         assertNull(result);
     }
+
+    @Test
+    public void testFindSystemVMReadyTemplate() {
+        Long zoneId = 1L;
+        VMTemplateVO systemVmTemplate1 = mock(VMTemplateVO.class);
+        Mockito.when(systemVmTemplate1.getArch()).thenReturn(CPU.CPUArch.x86);
+        Mockito.when(systemVmTemplate1.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
+        VMTemplateVO systemVmTemplate2 = mock(VMTemplateVO.class);
+        Mockito.when(systemVmTemplate2.getArch()).thenReturn(CPU.CPUArch.x86);
+        Mockito.when(systemVmTemplate2.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
+        VMTemplateVO systemVmTemplate3 = mock(VMTemplateVO.class);
+        Mockito.when(systemVmTemplate3.getArch()).thenReturn(CPU.CPUArch.arm64);
+        Mockito.when(systemVmTemplate3.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
+        List<VMTemplateVO> templates = Arrays.asList(systemVmTemplate1, systemVmTemplate2, systemVmTemplate3);
+        Mockito.when(hostDao.listDistinctHypervisorTypes(zoneId)).thenReturn(Arrays.asList(Hypervisor.HypervisorType.KVM));
+        SearchBuilder<VMTemplateVO> sb = mock(SearchBuilder.class);
+        templateDao.readySystemTemplateSearch = sb;
+        when(sb.create()).thenReturn(mock(SearchCriteria.class));
+        doReturn(templates).when(templateDao).listBy(any(SearchCriteria.class), any(Filter.class));
+        VMTemplateVO readyTemplate = templateDao.findSystemVMReadyTemplate(zoneId, Hypervisor.HypervisorType.KVM, CPU.CPUArch.arm64.getType());
+        Assert.assertEquals(CPU.CPUArch.arm64, readyTemplate.getArch());
+    }
 }