You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2015/04/30 11:03:50 UTC
[1/2] git commit: updated refs/heads/master to c275d6f
Repository: cloudstack
Updated Branches:
refs/heads/master 2133c302f -> c275d6fff
CLOUDSTACK-8414: Fixed template_spool_ref table is not getting updated with correct template_size Now returning file size instead of null.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fda627d6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fda627d6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fda627d6
Branch: refs/heads/master
Commit: fda627d6725fe0fdbe946960a21dcca77d774c8d
Parents: 2133c30
Author: Anshul Gangwar <an...@citrix.com>
Authored: Mon Mar 23 15:13:53 2015 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Thu Apr 30 14:36:39 2015 +0530
----------------------------------------------------------------------
.../ServerResource/HypervResource/HypervResourceController.cs | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fda627d6/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
index 76f56d9..9e706f9 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1647,7 +1647,10 @@ namespace HypervResource
throw new IOException(errMsg);
}
- newData = cmd.destTO;
+ FileInfo destFileInfo = new FileInfo(destFile);
+ destTemplateObjectTO.size = destFileInfo.Length.ToString();
+ JObject ansObj = Utils.CreateCloudStackObject(CloudStackTypes.TemplateObjectTO, destTemplateObjectTO);
+ newData = ansObj;
result = true;
}
else
@@ -1786,7 +1789,6 @@ namespace HypervResource
}
destTemplateObject.nfsDataStoreTO = destTemplateObjectTO.nfsDataStoreTO;
destTemplateObject.checksum = destTemplateObjectTO.checksum;
- newData = destTemplateObject;
JObject ansObj = Utils.CreateCloudStackObject(CloudStackTypes.TemplateObjectTO, destTemplateObject);
newData = ansObj;
result = true;
[2/2] git commit: updated refs/heads/master to c275d6f
Posted by ra...@apache.org.
CLOUDSTACK-8414: fixed template_spool_ref is not getting updated with correct template local_path
this closes #195
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c275d6ff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c275d6ff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c275d6ff
Branch: refs/heads/master
Commit: c275d6fff8923c3e46542f8dd491678f0d74b540
Parents: fda627d
Author: Anshul Gangwar <an...@citrix.com>
Authored: Mon Mar 23 16:46:08 2015 +0530
Committer: Rajesh Battala <ra...@citrix.com>
Committed: Thu Apr 30 14:36:58 2015 +0530
----------------------------------------------------------------------
.../ServerResource/HypervResource/HypervResourceController.cs | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c275d6ff/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
index 9e706f9..1afa977 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/HypervResourceController.cs
@@ -1649,6 +1649,7 @@ namespace HypervResource
FileInfo destFileInfo = new FileInfo(destFile);
destTemplateObjectTO.size = destFileInfo.Length.ToString();
+ destTemplateObjectTO.path = destTemplateObjectTO.uuid;
JObject ansObj = Utils.CreateCloudStackObject(CloudStackTypes.TemplateObjectTO, destTemplateObjectTO);
newData = ansObj;
result = true;