address review

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

Author: shwstppr

client/bindir/cloud-setup-management.in

@@ -92,6 +92,12 @@ def download_template_if_needed(template, url, filename, checksum):
         print(f"Downloading {template} System VM template from {url} to {dest_path}...")
     try:
         download_file(url, dest_path)
+        #After download, verify checksum if provided
+        if checksum:
+            if verify_sha512_checksum(dest_path, checksum):
+                print(f"{template} System VM template downloaded and verified successfully.")
+            else:
+                print(f"ERROR: Checksum verification failed for {template} System VM template after download.")
     except Exception as e:
         print(f"ERROR: Failed to download {template} System VM template: {e}")
 
@@ -164,9 +170,21 @@ if __name__ == '__main__':
     if templates_arg:
         templates_list = [t.strip().lower() for t in templates_arg.split(",")]
         if "all" in templates_list:
+            if len(templates_list) > 1:
+                print("WARNING: 'all' specified for System VM templates, ignoring other specified templates.")
             selected_templates = available_templates
         else:
-            selected_templates = [t for t in templates_list if t in available_templates]
+            invalid_templates = []
+            for t in templates_list:
+                if t in available_templates:
+                    if t not in selected_templates:
+                        selected_templates.append(t)
+                else:
+                    if t not in invalid_templates:
+                        invalid_templates.append(t)
+            if invalid_templates:
+                print(f"ERROR: Invalid System VM template names provided: {', '.join(invalid_templates)}")
+                sys.exit(1)
     print(f"Selected systemvm templates to download: {', '.join(selected_templates) if selected_templates else 'None'}")
 
     template_metadata_list = []

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

@@ -109,7 +109,8 @@ public class SystemVmTemplateRegistration {
     private static Integer LINUX_12_ID = 363;
     private static final Integer SCRIPT_TIMEOUT = 1800000;
     private static final Integer LOCK_WAIT_TIMEOUT = 1200;
-    protected static final String TEMPLATES_DOWNLOAD_REPOSITORY_KEY = "downloadurl";
+    protected static final String TEMPLATE_DOWNLOAD_URL_KEY = "downloadurl";
+    protected static final String TEMPLATES_DOWNLOAD_REPOSITORY_KEY = "downloadrepository";
     protected static final String TEMPLATES_CUSTOM_DOWNLOAD_REPOSITORY_KEY = "system.vm.templates.download.repository";
     protected static final List<CPU.CPUArch> DOWNLOADABLE_TEMPLATE_ARCH_TYPES = Arrays.asList(
             CPU.CPUArch.amd64,
@@ -837,7 +838,7 @@ public static String parseMetadataFile() {
                         key, metadataFilePath);
                 continue;
             }
-            String url = section.get("downloadurl");
+            String url = section.get(TEMPLATE_DOWNLOAD_URL_KEY);
             if (StringUtils.isNotBlank(url) && updateCustomDownloadRepository) {
                 url = url.replaceFirst(defaultDownloadRepository.trim(),
                         customDownloadRepository.trim());

engine/schema/templateConfig.sh

@@ -88,7 +88,7 @@ declare -A template_specs=(
   [kvm-aarch64]="aarch64-kvm.qcow2.bz2"
   [vmware]="x86_64-vmware.ova"
   [xenserver]="x86_64-xen.vhd.bz2"
-  [hyperv4]="x86_64-hyperv.vhd.zip"
+  [hyperv]="x86_64-hyperv.vhd.zip"
   [lxc]="x86_64-kvm.qcow2.bz2"
   [ovm3]="x86_64-ovm.raw.bz2"
 )