Store and show Guest os type in the backup metadata

Author: abh1sar

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

@@ -122,12 +122,14 @@
 import com.cloud.serializer.GsonHelper;
 import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.storage.DiskOfferingVO;
+import com.cloud.storage.GuestOSVO;
 import com.cloud.storage.ScopeType;
 import com.cloud.storage.Storage;
 import com.cloud.storage.Volume;
 import com.cloud.storage.VolumeApiService;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.DiskOfferingDao;
+import com.cloud.storage.dao.GuestOSDao;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.storage.dao.VolumeDao;
 import com.cloud.template.VirtualMachineTemplate;
@@ -232,6 +234,8 @@ public class BackupManagerImpl extends ManagerBase implements BackupManager {
     private ResourceLimitService resourceLimitMgr;
     @Inject
     private AlertManager alertManager;
+    @Inject
+    private GuestOSDao _guestOSDao;
 
     private AsyncJobDispatcher asyncJobDispatcher;
     private Timer backupTimer;
@@ -380,7 +384,12 @@ public Map<String, String> getBackupDetailsFromVM(VirtualMachine vm) {
         details.put(ApiConstants.SERVICE_OFFERING_ID, serviceOffering.getUuid());
         VirtualMachineTemplate template = vmTemplateDao.findById(vm.getTemplateId());
         if (template != null) {
+            long guestOSId = template.getGuestOSId();
             details.put(ApiConstants.TEMPLATE_ID, template.getUuid());
+            GuestOSVO guestOS = _guestOSDao.findById(guestOSId);
+            if (guestOS != null) {
+                details.put(ApiConstants.OS_ID, guestOS.getUuid());
+            }
         }
 
         List<VMInstanceDetailVO> vmDetails = vmInstanceDetailsDao.listDetails(vm.getId());
@@ -2104,6 +2113,12 @@ Map<String, String> getDetailsFromBackupDetails(Long backupId) {
                 details.put(ApiConstants.IS_ISO, String.valueOf(template.getFormat().equals(Storage.ImageFormat.ISO)));
             }
         }
+        if (details.containsKey(ApiConstants.OS_ID)) {
+            GuestOSVO guestOS = _guestOSDao.findByUuid(details.get(ApiConstants.OS_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) {

ui/src/components/view/BackupMetadata.vue

@@ -42,6 +42,11 @@
               {{ getTemplateDisplayName() }}
             </router-link>
           </div>
+          <div v-else-if="item === 'osid'">
+            <router-link :to="{ path: '/guestos' + '/' + backupMetadata[item] }">
+              {{ backupMetadata.osname }}
+            </router-link>
+          </div>
           <div v-else-if="item === 'serviceofferingid'">
             <router-link :to="{ path: '/computeoffering/' + backupMetadata[item] }">
               {{ getServiceOfferingDisplayName() }}
@@ -84,15 +89,14 @@ export default {
       if (!this.backupMetadata || Object.keys(this.backupMetadata).length === 0) {
         return []
       }
-      const fieldOrder = []
-      fieldOrder.push('templateid')
-      if (this.backupMetadata.isiso === 'true') {
-        fieldOrder.push('hypervisor')
-      }
-      fieldOrder.push('serviceofferingid')
-      fieldOrder.push('nics')
-      fieldOrder.push('vmsettings')
-
+      const fieldOrder = [
+        'templateid',
+        'osid',
+        'hypervisor',
+        'serviceofferingid',
+        'nics',
+        'vmsettings'
+      ]
       return fieldOrder.filter(field => this.backupMetadata[field] !== undefined)
     },
     getNicEntities () {
@@ -108,6 +112,9 @@ export default {
       if (field === 'vmsettings') {
         return this.$t('label.settings')
       }
+      if (field === 'osid') {
+        return this.$t('label.ostypeid')
+      }
       return this.$t('label.' + String(field).toLowerCase())
     },
     getTemplateDisplayName () {