review comments

Author: abh1sar

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -389,6 +389,7 @@ public Map<String, String> getBackupDetailsFromVM(VirtualMachine vm) {
             GuestOSVO guestOS = _guestOSDao.findById(guestOSId);
             if (guestOS != null) {
                 details.put(ApiConstants.OS_TYPE_ID, guestOS.getUuid());
+                details.put(ApiConstants.OS_NAME, guestOS.getDisplayName());
             }
         }
 
@@ -2108,21 +2109,13 @@ Map<String, String> getDetailsFromBackupDetails(Long backupId) {
         if (details.containsKey(ApiConstants.TEMPLATE_ID)) {
             VirtualMachineTemplate template = vmTemplateDao.findByUuid(details.get(ApiConstants.TEMPLATE_ID));
             if (template != null) {
-                details.put(ApiConstants.TEMPLATE_ID, template.getUuid());
                 details.put(ApiConstants.TEMPLATE_NAME, template.getName());
                 details.put(ApiConstants.IS_ISO, String.valueOf(template.getFormat().equals(Storage.ImageFormat.ISO)));
             }
         }
-        if (details.containsKey(ApiConstants.OS_TYPE_ID)) {
-            GuestOSVO guestOS = _guestOSDao.findByUuid(details.get(ApiConstants.OS_TYPE_ID));
-            if (guestOS != null) {
-                details.put(ApiConstants.OS_NAME, guestOS.getDisplayName());
-            }
-        }
         if (details.containsKey(ApiConstants.SERVICE_OFFERING_ID)) {
             ServiceOffering serviceOffering = serviceOfferingDao.findByUuid(details.get(ApiConstants.SERVICE_OFFERING_ID));
             if (serviceOffering != null) {
-                details.put(ApiConstants.SERVICE_OFFERING_ID, serviceOffering.getUuid());
                 details.put(ApiConstants.SERVICE_OFFERING_NAME, serviceOffering.getName());
             }
         }
@@ -2201,7 +2194,9 @@ public BackupResponse createBackupResponse(Backup backup, Boolean listVmDetails)
 
         if (Boolean.TRUE.equals(listVmDetails)) {
             Map<String, String> vmDetails = new HashMap<>();
-            vmDetails.put(ApiConstants.HYPERVISOR, vm.getHypervisorType().toString());
+            if (vm != null) {
+                vmDetails.put(ApiConstants.HYPERVISOR, vm.getHypervisorType().toString());
+            }
             Map<String, String> details = getDetailsFromBackupDetails(backup.getId());
             vmDetails.putAll(details);
             response.setVmDetails(vmDetails);

server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java

@@ -1573,14 +1573,12 @@ public void testNewBackupResponse() {
 
         VMTemplateVO template = mock(VMTemplateVO.class);
         when(template.getFormat()).thenReturn(Storage.ImageFormat.QCOW2);
-        when(template.getUuid()).thenReturn(templateUuid);
         when(template.getName()).thenReturn("template1");
         when(vmTemplateDao.findByUuid(templateUuid)).thenReturn(template);
         Map<String, String> details = new HashMap<>();
         details.put(ApiConstants.TEMPLATE_ID, templateUuid);
 
         ServiceOfferingVO serviceOffering = mock(ServiceOfferingVO.class);
-        when(serviceOffering.getUuid()).thenReturn(serviceOfferingUuid);
         when(serviceOffering.getName()).thenReturn("service-offering1");
         when(serviceOfferingDao.findByUuid(serviceOfferingUuid)).thenReturn(serviceOffering);
         details.put(ApiConstants.SERVICE_OFFERING_ID, serviceOfferingUuid);

ui/src/components/view/DeployVMFromBackup.vue

@@ -168,9 +168,11 @@
                       :tabList="tabList"
                       :activeTabKey="tabKey"
                       @tabChange="key => onTabChange(key, 'tabKey')">
-                      <a-alert v-if="showOsTypeWarning">
+                      <a-alert
+                        v-if="showOsTypeWarning && selectedTemplateIso"
+                        style="margin-bottom: 10px">
                         <template #message>
-                          <div v-if="selectedTemplateIso && dataPreFill.ostypename">
+                          <div>
                             {{ selectedTemplateIso.message }}<br>
                             {{ selectedTemplateIso.label }} :
                             <router-link :to="{ path: '/guestos/' + selectedTemplateIso.item.ostypeid }">
@@ -183,7 +185,6 @@
                           </div>
                         </template>
                       </a-alert>
-                      <br v-if="showOsTypeWarning"/>
                       <div v-if="tabKey === 'templateid'">
                         {{ $t('message.template.desc') }}
                         <div v-if="isZoneSelectedMultiArch" style="width: 100%; margin-top: 5px">
@@ -1713,7 +1714,7 @@ export default {
           this.form.iothreadsenabled = template.details && Object.prototype.hasOwnProperty.call(template.details, 'iothreads')
           this.form.iodriverpolicy = template.details?.['io.policy']
           this.form.keyboard = template.details?.keyboard
-          this.showOsTypeWarning = template.ostypeid !== this.dataPreFill.ostypeid
+          this.showOsTypeWarning = this.dataPreFill.ostypeid && template.ostypeid !== this.dataPreFill.ostypeid
           if (template.details['vmware-to-kvm-mac-addresses']) {
             this.dataPreFill.macAddressArray = JSON.parse(template.details['vmware-to-kvm-mac-addresses'])
           }
@@ -1730,7 +1731,7 @@ export default {
         for (const key in this.options.isos) {
           var iso = _.find(_.get(this.options.isos[key], 'iso', []), (option) => option.id === value)
           if (iso) {
-            this.showOsTypeWarning = iso.ostypeid !== this.dataPreFill.ostypeid
+            this.showOsTypeWarning = this.dataPreFill.ostypeid && iso.ostypeid !== this.dataPreFill.ostypeid
             break
           }
         }