etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.16'

This commit is contained in:
Rohit Yadav 2022-01-03 19:38:31 +05:30
parent 11e59b3c34 5f93bc8948
commit bf3d1338e0
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/com/cloud/storage/template/OVAProcessor.java
View File

@ -246,7 +246,17 @@ public class OVAProcessor extends AdapterBase implements Processor {
NodeList diskElements = new OVFHelper().getElementsByTagNameAndPrefix(ovfDoc, "Disk", "ovf");
for (int i = 0; i < diskElements.getLength(); i++) {
Element disk = (Element)diskElements.item(i);
long diskSize = Long.parseLong(disk.getAttribute("ovf:capacity"));
String diskSizeValue = disk.getAttribute("ovf:capacity");
long diskSize = 1;
try {
diskSize = Long.parseLong(diskSizeValue);
} catch (NumberFormatException e) {
// ASSUMEably the diskSize contains a property for replacement
LOGGER.warn(String.format("the disksize for disk %s is not a valid number: %s", disk.getAttribute("diskId"), diskSizeValue));
// TODO parse the property to get any value can not be done at registration time
// and will have to be done at deploytime, so for orchestration purposes
// we now assume, a value of one
}
String allocationUnits = disk.getAttribute("ovf:capacityAllocationUnits");
diskSize = OVFHelper.getDiskVirtualSize(diskSize, allocationUnits, ovfFileName);
virtualSize += diskSize;