Skip to content

[Vmware] Fix for OVF parsing error #2567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 1 commit into from
Apr 13, 2018
Merged

[Vmware] Fix for OVF parsing error #2567

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/com/cloud/agent/api/storage/OVFHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public List<DatadiskTO> getOVFVolumeInfo(final String ovfFilePath) {
String allocationUnits = disk.getAttribute("ovf:capacityAllocationUnits");
od._diskId = disk.getAttribute("ovf:diskId");
od._fileRef = disk.getAttribute("ovf:fileRef");
od._populatedSize = Long.parseLong(disk.getAttribute("ovf:populatedSize") == null ? "0" : disk.getAttribute("ovf:populatedSize"));
od._populatedSize = NumberUtils.toLong(disk.getAttribute("ovf:populatedSize"));

@yadvr yadvr Apr 13, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nvazquez this can cause exception still -- this should be used with a default value like 0L in case of error. For example like this -- NumberUtils.toLong("string-param", 0L) . Also no tests were ran /cc @DaanHoogland

@DaanHoogland DaanHoogland Apr 13, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rhtyd NumberUtils.toLong(Sting) calls NumberUtils.toLong(Sting,0L)

@DaanHoogland DaanHoogland Apr 13, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry @rhtyd , you are right about the tests. I saw @borisstoyanov 's lgtm and assumed.

@yadvr yadvr Apr 13, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DaanHoogland cool, I did not know that internally it falls to NumberUtils.toLong(String,0L)

@DaanHoogland DaanHoogland Apr 13, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remains teh question: are we settling for the ci on this one (i did check that before merging) @rhtyd @rafaelweingartner @borisstoyanov ?

@rafaelweingartner rafaelweingartner Apr 13, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, now it is already merged. However, I do not see the need to run those tests again; they are the same tests used when the code was merged, right? Testes passed then, they will pass now. Unless you had a case, which could cause the case that @nvazquez addressed here.

@yadvr yadvr Apr 13, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DaanHoogland let's kick tests both on master and 4.11 over the weekend. I don't think Nicolas's pr will cause any fail, besides Travis and pkging has passed.


if ((od._capacity != 0) && (allocationUnits != null)) {

Expand Down