Refactor secondary storage replica limit handling to use zone-specific values

Author: Damans227

server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java

@@ -292,11 +292,11 @@ protected void createTemplateWithinZones(TemplateProfile profile, VMTemplateVO t
 
             if (imageStore == null) {
                 List<DataStore> imageStores = getImageStoresThrowsExceptionIfNotFound(zoneId, profile);
-                standardImageStoreAllocation(imageStores, template);
+                standardImageStoreAllocation(imageStores, template, zoneId);
             } else {
                 int replicaLimit = isPrivateTemplate(template)
-                        ? TemplateManager.PrivateTemplateSecStorageCopy.value()
-                        : TemplateManager.PublicTemplateSecStorageCopy.value();
+                        ? TemplateManager.PrivateTemplateSecStorageCopy.valueIn(zoneId)
+                        : TemplateManager.PublicTemplateSecStorageCopy.valueIn(zoneId);
                 validateSecondaryStorageAndCreateTemplate(List.of(imageStore), template, new HashMap<>(), replicaLimit);
             }
         }
@@ -310,10 +310,10 @@ protected List<DataStore> getImageStoresThrowsExceptionIfNotFound(long zoneId, T
         return imageStores;
     }
 
-    protected void standardImageStoreAllocation(List<DataStore> imageStores, VMTemplateVO template) {
+    protected void standardImageStoreAllocation(List<DataStore> imageStores, VMTemplateVO template, long zoneId) {
         int replicaLimit = isPrivateTemplate(template)
-                ? TemplateManager.PrivateTemplateSecStorageCopy.value()
-                : TemplateManager.PublicTemplateSecStorageCopy.value();
+                ? TemplateManager.PrivateTemplateSecStorageCopy.valueIn(zoneId)
+                : TemplateManager.PublicTemplateSecStorageCopy.valueIn(zoneId);
         Collections.shuffle(imageStores);
         validateSecondaryStorageAndCreateTemplate(imageStores, template, new HashMap<>(), replicaLimit);
     }

server/src/main/java/com/cloud/template/TemplateAdapterBase.java

@@ -204,13 +204,14 @@ protected boolean isZoneAndImageStoreAvailable(DataStore imageStore, Long zoneId
      * {@link TemplateProfile#getZoneIdList()}.
      */
     protected void postUploadAllocation(List<DataStore> imageStores, VMTemplateVO template, List<TemplateOrVolumePostUploadCommand> payloads) {
-        int replicaLimit = isPrivateTemplate(template)
-                ? TemplateManager.PrivateTemplateSecStorageCopy.value()
-                : TemplateManager.PublicTemplateSecStorageCopy.value();
+        boolean isPrivate = isPrivateTemplate(template);
         Map<Long, Integer> zoneCopyCount = new HashMap<>();
         Collections.shuffle(imageStores);
         for (DataStore imageStore : imageStores) {
             Long zoneId_is = imageStore.getScope().getScopeId();
+            int replicaLimit = zoneId_is == null ? 0 : (isPrivate
+                    ? TemplateManager.PrivateTemplateSecStorageCopy.valueIn(zoneId_is)
+                    : TemplateManager.PublicTemplateSecStorageCopy.valueIn(zoneId_is));
 
             if (!isZoneAndImageStoreAvailable(imageStore, zoneId_is, zoneCopyCount, replicaLimit)) {
                 continue;

server/src/test/java/com/cloud/template/HypervisorTemplateAdapterTest.java

@@ -337,7 +337,7 @@ public void createTemplateWithinZonesTestZoneIdsNotNullShouldNotCallListAllZones
         Mockito.when(templateProfileMock.getZoneIdList()).thenReturn(zoneIds);
         Mockito.doReturn(null).when(_adapter).getImageStoresThrowsExceptionIfNotFound(Mockito.any(Long.class), Mockito.any(TemplateProfile.class));
         Mockito.doReturn(null).when(_templateMgr).verifyHeuristicRulesForZone(Mockito.any(VMTemplateVO.class), Mockito.anyLong());
-        Mockito.doNothing().when(_adapter).standardImageStoreAllocation(Mockito.isNull(), Mockito.any(VMTemplateVO.class));
+        Mockito.doNothing().when(_adapter).standardImageStoreAllocation(Mockito.isNull(), Mockito.any(VMTemplateVO.class), Mockito.anyLong());
 
         _adapter.createTemplateWithinZones(templateProfileMock, vmTemplateVOMock);
 
@@ -353,11 +353,11 @@ public void createTemplateWithinZonesTestZoneDoesNotHaveActiveHeuristicRulesShou
         Mockito.when(templateProfileMock.getZoneIdList()).thenReturn(zoneIds);
         Mockito.doReturn(null).when(_adapter).getImageStoresThrowsExceptionIfNotFound(Mockito.any(Long.class), Mockito.any(TemplateProfile.class));
         Mockito.doReturn(null).when(_templateMgr).verifyHeuristicRulesForZone(Mockito.any(VMTemplateVO.class), Mockito.anyLong());
-        Mockito.doNothing().when(_adapter).standardImageStoreAllocation(Mockito.isNull(), Mockito.any(VMTemplateVO.class));
+        Mockito.doNothing().when(_adapter).standardImageStoreAllocation(Mockito.isNull(), Mockito.any(VMTemplateVO.class), Mockito.anyLong());
 
         _adapter.createTemplateWithinZones(templateProfileMock, vmTemplateVOMock);
 
-        Mockito.verify(_adapter, Mockito.times(1)).standardImageStoreAllocation(Mockito.isNull(), Mockito.any(VMTemplateVO.class));
+        Mockito.verify(_adapter, Mockito.times(1)).standardImageStoreAllocation(Mockito.isNull(), Mockito.any(VMTemplateVO.class), Mockito.anyLong());
     }
 
     @Test