From 3cddd72c9b4c959bb62e2357ea7afabcde187202 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Thu, 2 Jun 2011 20:28:46 -0400 Subject: [PATCH] fix template sync issue --- .../src/com/cloud/storage/template/DownloadManagerImpl.java | 6 ++++++ tools/test/cloudkit.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/com/cloud/storage/template/DownloadManagerImpl.java b/core/src/com/cloud/storage/template/DownloadManagerImpl.java index 17a2fbfd67b..e7a6d2e7ef1 100755 --- a/core/src/com/cloud/storage/template/DownloadManagerImpl.java +++ b/core/src/com/cloud/storage/template/DownloadManagerImpl.java @@ -608,6 +608,7 @@ public class DownloadManagerImpl implements DownloadManager { private List listTemplates(String rootdir) { List result = new ArrayList(); + Script script = new Script(listTmpltScr, s_logger); script.add("-r", rootdir); ZfsPathParser zpp = new ZfsPathParser(rootdir); @@ -621,6 +622,11 @@ public class DownloadManagerImpl implements DownloadManager { public Map gatherTemplateInfo(String rootDir) { Map result = new HashMap(); String templateDir = rootDir + File.separator + _templateDir; + + if (! _storage.exists(templateDir)) { + _storage.mkdirs(templateDir); + } + List publicTmplts = listTemplates(templateDir); for (String tmplt : publicTmplts) { String path = tmplt.substring(0, tmplt.lastIndexOf(File.separator)); diff --git a/tools/test/cloudkit.py b/tools/test/cloudkit.py index 2b5f6e2ef61..b8ec1b75b74 100644 --- a/tools/test/cloudkit.py +++ b/tools/test/cloudkit.py @@ -15,7 +15,7 @@ def fix_default_db(): database.update(statement % ('http://nfs1.lab.vmops.com/templates/dummy/systemvm.ova', 'routing-8')) database.update(statement % ('http://nfs1.lab.vmops.com/templates/dummy/builtin.vhd', 'centos53-x86_64')) - database.update(statement % ('http://nfs1.lab.vmops.com/templates/dummy/builtin.qcow2', 'centos55-x86_64')) + database.update(statement % ('http://nfs1.lab.vmops.com/templates/rightscale/RightImage_CentOS_5.4_x64_v5.6.32.qcow2.bz2', 'centos55-x86_64')) database.update(statement % ('http://nfs1.lab.vmops.com/templates/dummy/builtin.ova', 'centos53-x64')) statement="""UPDATE vm_template SET checksum=NULL""" database.update(statement)