add tests

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

Author: shwstppr

api/src/main/java/com/cloud/cpu/CPU.java

@@ -32,6 +32,10 @@ public enum CPUArch {
             this.bits = bits;
         }
 
+        public static CPUArch getDefault() {
+            return amd64;
+        }
+
         public String getType() {
             return type;
         }
@@ -42,7 +46,7 @@ public int getBits() {
 
         public static CPUArch fromType(String type) {
             if (StringUtils.isBlank(type)) {
-                return amd64; // Default architecture
+                return getDefault();
             }
             for (CPUArch arch : values()) {
                 if (arch.type.equals(type)) {

engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java

@@ -97,7 +97,7 @@ public class SystemVmTemplateRegistration {
     private static final String ABSOLUTE_TEMPLATE_PATH = "/usr/share/cloudstack-management/templates/systemvm/";
     private static final String TEMPLATES_PATH = fetchTemplatesPath();
     private static final String METADATA_FILE_NAME = "metadata.ini";
-    private static final String METADATA_FILE = TEMPLATES_PATH + METADATA_FILE_NAME;
+    protected static final String METADATA_FILE = TEMPLATES_PATH + METADATA_FILE_NAME;
     public static final String TEMPORARY_SECONDARY_STORE = "tmp";
     private static final String PARTIAL_TEMPLATE_FOLDER = String.format("/template/tmpl/%d/", Account.ACCOUNT_ID_SYSTEM);
     private static final String storageScriptsDir = "scripts/storage/secondary";
@@ -106,7 +106,7 @@ public class SystemVmTemplateRegistration {
     private static final Integer LINUX_7_ID = 183;
     private static final Integer SCRIPT_TIMEOUT = 1800000;
     private static final Integer LOCK_WAIT_TIMEOUT = 1200;
-    private static final List<CPU.CPUArch> DOWNLOADABLE_TEMPLATE_ARCH_TYPES = Arrays.asList(
+    protected static final List<CPU.CPUArch> DOWNLOADABLE_TEMPLATE_ARCH_TYPES = Arrays.asList(
             CPU.CPUArch.arm64
     );
 
@@ -173,6 +173,10 @@ public String getSystemVmTemplateVersion() {
         return systemVmTemplateVersion;
     }
 
+    public File getTempDownloadDir() {
+        return tempDownloadDir;
+    }
+
     private static class SystemVMTemplateDetails {
         Long id;
         String uuid;
@@ -391,15 +395,15 @@ private static String getHypervisorArchLog(Hypervisor.HypervisorType hypervisorT
         return sb.toString();
     }
 
-    private static String getHypervisorArchKey(Hypervisor.HypervisorType hypervisorType, CPU.CPUArch arch) {
+    protected static String getHypervisorArchKey(Hypervisor.HypervisorType hypervisorType, CPU.CPUArch arch) {
         if (Hypervisor.HypervisorType.KVM.equals(hypervisorType)) {
             return String.format("%s-%s", hypervisorType.name().toLowerCase(),
                     arch == null ? CPU.CPUArch.amd64.getType() : arch.getType());
         }
         return hypervisorType.name().toLowerCase();
     }
 
-    private static MetadataTemplateDetails getMetadataTemplateDetails(Hypervisor.HypervisorType hypervisorType,
+    protected static MetadataTemplateDetails getMetadataTemplateDetails(Hypervisor.HypervisorType hypervisorType,
               CPU.CPUArch arch) {
         return NewTemplateMap.get(getHypervisorArchKey(hypervisorType, arch));
     }
@@ -441,7 +445,7 @@ private List<Long> getEligibleZoneIds() {
         return zoneIds;
     }
 
-    private Pair<String, Long> getNfsStoreInZone(Long zoneId) {
+    protected Pair<String, Long> getNfsStoreInZone(Long zoneId) {
         ImageStoreVO storeVO = imageStoreDao.findOneByZoneAndProtocol(zoneId, "nfs");
         if (storeVO == null) {
             String errMsg = String.format("Failed to fetch NFS store in zone = %s for SystemVM template registration",
@@ -456,12 +460,13 @@ private Pair<String, Long> getNfsStoreInZone(Long zoneId) {
 
     public static void mountStore(String storeUrl, String path, String nfsVersion) {
         try {
-            if (storeUrl != null) {
-                URI uri = new URI(UriUtils.encodeURIComponent(storeUrl));
-                String host = uri.getHost();
-                String mountPath = uri.getPath();
-                Script.runSimpleBashScript(getMountCommand(nfsVersion, host + ":" + mountPath, path));
+            if (storeUrl == null) {
+                return;
             }
+            URI uri = new URI(UriUtils.encodeURIComponent(storeUrl));
+            String host = uri.getHost();
+            String mountPath = uri.getPath();
+            Script.runSimpleBashScript(getMountCommand(nfsVersion, host + ":" + mountPath, path));
         } catch (Exception e) {
             String msg = "NFS Store URL is not in the correct format";
             LOGGER.error(msg, e);
@@ -783,7 +788,7 @@ public static String parseMetadataFile() {
                     hypervisorType.second()));
         }
         Ini.Section defaultSection = ini.get("default");
-        return defaultSection.get("version");
+        return defaultSection.get("version").trim();
     }
 
 
@@ -830,7 +835,7 @@ protected boolean isTemplateFileChecksumDifferent(MetadataTemplateDetails templa
         return false;
     }
 
-    private void validateTemplates(List<Pair<Hypervisor.HypervisorType, CPU.CPUArch>> hypervisorsArchInUse) {
+    protected void validateTemplates(List<Pair<Hypervisor.HypervisorType, CPU.CPUArch>> hypervisorsArchInUse) {
         boolean templatesFound = true;
         for (Pair<Hypervisor.HypervisorType, CPU.CPUArch> hypervisorArch : hypervisorsArchInUse) {
             MetadataTemplateDetails matchedTemplate = getMetadataTemplateDetails(hypervisorArch.first(),