apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-15 18:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4295 : TemplateTO should contain physical size along with virtual size. Usage ignores templates with size 0

Browse Source
This commit is contained in:
Kishan Kavala 2013-08-14 15:07:46 +05:30
parent d771e3fa5b
commit 21831211f6
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/org/apache/cloudstack/storage/to/TemplateObjectTO.java
View File

@ -39,6 +39,7 @@ public class TemplateObjectTO implements DataTO {
private String name; private String name;
private String guestOsType; private String guestOsType;
private Long size; private Long size;
private Long physicalSize;
private Hypervisor.HypervisorType hypervisorType; private Hypervisor.HypervisorType hypervisorType;
public TemplateObjectTO() { public TemplateObjectTO() {
@ -200,6 +201,14 @@ public class TemplateObjectTO implements DataTO {
this.size = size; this.size = size;
} }
public Long getPhysicalSize() {
return physicalSize;
}
public void setPhysicalSize(Long physicalSize) {
this.physicalSize = physicalSize;
}
@Override @Override
public String toString() { public String toString() {
return new StringBuilder("TemplateTO[id=").append(id).append("|origUrl=").append(origUrl) return new StringBuilder("TemplateTO[id=").append(id).append("|origUrl=").append(origUrl)

1
engine/storage/image/src/org/apache/cloudstack/storage/image/store/TemplateObject.java
View File

@ -198,6 +198,7 @@ public class TemplateObject implements TemplateInfo {
templateStoreRef.setDownloadPercent(100); templateStoreRef.setDownloadPercent(100);
templateStoreRef.setDownloadState(Status.DOWNLOADED); templateStoreRef.setDownloadState(Status.DOWNLOADED);
templateStoreRef.setSize(newTemplate.getSize()); templateStoreRef.setSize(newTemplate.getSize());
templateStoreRef.setPhysicalSize(newTemplate.getPhysicalSize());
templateStoreDao.update(templateStoreRef.getId(), templateStoreRef); templateStoreDao.update(templateStoreRef.getId(), templateStoreRef);
if (this.getDataStore().getRole() == DataStoreRole.Image) { if (this.getDataStore().getRole() == DataStoreRole.Image) {
VMTemplateVO templateVO = this.imageDao.findById(this.getId()); VMTemplateVO templateVO = this.imageDao.findById(this.getId());

2
services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
View File

@ -382,6 +382,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
newTemplate.setPath(destData.getPath() + File.separator + templateName); newTemplate.setPath(destData.getPath() + File.separator + templateName);
newTemplate.setFormat(ImageFormat.VHD); newTemplate.setFormat(ImageFormat.VHD);
newTemplate.setSize(prop.getSize()); newTemplate.setSize(prop.getSize());
newTemplate.setPhysicalSize(prop.getPhysicalSize());
return new CopyCmdAnswer(newTemplate); return new CopyCmdAnswer(newTemplate);
} catch (ConfigurationException e) { } catch (ConfigurationException e) {
s_logger.debug("Failed to create template from snapshot: " + e.toString()); s_logger.debug("Failed to create template from snapshot: " + e.toString());
@ -444,6 +445,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
newTemplate.setPath(destData.getPath() + File.separator + templateName + "." + ImageFormat.QCOW2.getFileExtension()); newTemplate.setPath(destData.getPath() + File.separator + templateName + "." + ImageFormat.QCOW2.getFileExtension());
newTemplate.setFormat(ImageFormat.QCOW2); newTemplate.setFormat(ImageFormat.QCOW2);
newTemplate.setSize(prop.getSize()); newTemplate.setSize(prop.getSize());
newTemplate.setPhysicalSize(prop.getPhysicalSize());
return new CopyCmdAnswer(newTemplate); return new CopyCmdAnswer(newTemplate);
} catch (ConfigurationException e) { } catch (ConfigurationException e) {
s_logger.debug("Failed to create template:" + e.toString()); s_logger.debug("Failed to create template:" + e.toString());