cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sanjaytripa...@apache.org
Subject git commit: updated refs/heads/master to 3d411dc
Date Fri, 13 Mar 2015 09:27:39 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 602fafd0a -> 3d411dc61


Fixed simulator and vmware NPE issue.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d411dc6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d411dc6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d411dc6

Branch: refs/heads/master
Commit: 3d411dc616a405860c0c10c056255b16244fcf67
Parents: 602fafd
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Fri Mar 13 14:46:39 2015 +0530
Committer: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Committed: Fri Mar 13 14:59:34 2015 +0530

----------------------------------------------------------------------
 .../simulator/src/com/cloud/resource/SimulatorStorageProcessor.java | 1 +
 .../src/com/cloud/storage/resource/VmwareStorageProcessor.java      | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d411dc6/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
index 527b32f..cae9261 100644
--- a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
+++ b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorStorageProcessor.java
@@ -70,6 +70,7 @@ public class SimulatorStorageProcessor implements StorageProcessor {
     public Answer copyTemplateToPrimaryStorage(CopyCommand cmd) {
         TemplateObjectTO template = new TemplateObjectTO();
         template.setPath(UUID.randomUUID().toString());
+        template.setSize(new Long(100));
         template.setFormat(Storage.ImageFormat.RAW);
         return new CopyCmdAnswer(template);
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3d411dc6/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
index c569a50..ea91816 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -345,6 +345,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
             else {
                 newTemplate.setPath(templateUuidName);
             }
+            newTemplate.setSize(new Long(0)); // TODO: replace 0 with correct template physical_size.
 
             return new CopyCmdAnswer(newTemplate);
         } catch (Throwable e) {


Mime
View raw message