CLOUDSTACK-10146: Fixes for ISOs

Author: nvazquez

agent/src/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java

@@ -185,8 +185,8 @@ public boolean validateChecksum() {
             String algorithm = providedChecksum.getAlgorithm();
             String checksumCommand = "echo '%s %s' | %s -c --quiet";
             String cmd = String.format(checksumCommand, providedChecksum.getChecksum(), downloadedFilePath, getChecksumCommandFromAlgorithm(algorithm));
-            String result = Script.runSimpleBashScript(cmd);
-            return StringUtils.isBlank(result);
+            int result = Script.runSimpleBashScriptForExitValue(cmd);
+            return result == 0;
         }
         return true;
     }

plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java

@@ -904,13 +904,21 @@ public Answer attachIso(final AttachCommand cmd) {
         final DiskTO disk = cmd.getDisk();
         final TemplateObjectTO isoTO = (TemplateObjectTO)disk.getData();
         final DataStoreTO store = isoTO.getDataStore();
-        if (!(store instanceof NfsTO)) {
+        String dataStoreUrl = null;
+        if (store instanceof NfsTO) {
+            NfsTO nfsStore = (NfsTO)store;
+            dataStoreUrl = nfsStore.getUrl();
+        } else if (store instanceof PrimaryDataStoreTO && ((PrimaryDataStoreTO) store).getPoolType().equals(StoragePoolType.NetworkFilesystem)) {
+            //In order to support directly downloaded ISOs
+            String psHost = ((PrimaryDataStoreTO) store).getHost();
+            String psPath = ((PrimaryDataStoreTO) store).getPath();
+            dataStoreUrl = "nfs://" + psHost + File.separator + psPath;
+        } else {
             return new AttachAnswer("unsupported protocol");
         }
-        final NfsTO nfsStore = (NfsTO)store;
         try {
             final Connect conn = LibvirtConnection.getConnectionByVmName(cmd.getVmName());
-            attachOrDetachISO(conn, cmd.getVmName(), nfsStore.getUrl() + File.separator + isoTO.getPath(), true);
+            attachOrDetachISO(conn, cmd.getVmName(), dataStoreUrl + File.separator + isoTO.getPath(), true);
         } catch (final LibvirtException e) {
             return new Answer(cmd, false, e.toString());
         } catch (final URISyntaxException e) {

server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java

@@ -323,6 +323,8 @@ public TemplateResponse newIsoResponse(TemplateJoinVO iso) {
                     } else {
                         isoStatus = iso.getDownloadPercent() + "% Downloaded";
                     }
+                } else if (iso.getDownloadState() == Status.BYPASSED) {
+                    isoStatus = "Bypassed Secondary Storage";
                 } else {
                     isoStatus = iso.getErrorString();
                 }

server/src/com/cloud/template/TemplateManagerImpl.java

@@ -1203,7 +1203,7 @@ private boolean attachISOToVM(long vmId, long isoId, boolean attach) {
         }
 
         // prepare ISO ready to mount on hypervisor resource level
-        TemplateInfo tmplt = prepareIso(isoId, vm.getDataCenterId(), null, null);
+        TemplateInfo tmplt = prepareIso(isoId, vm.getDataCenterId(), vm.getHostId(), null);
 
         String vmName = vm.getInstanceName();