Skip to content

Fix for mapping guest OS type read from OVF to existing guest OS in C… #4553

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
yadvr merged 4 commits into from
Dec 23, 2020
Merged

Fix for mapping guest OS type read from OVF to existing guest OS in C… #4553

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c79723
Fix for mapping guest OS type read from OVF to existing guest OS in C…
harikrishna-patnala Dec 19, 2020
f72f2fd
Added unit tests to String Utils methods and updated the code
harikrishna-patnala Dec 21, 2020
c1a9f41
Updated the java doc section
harikrishna-patnala Dec 21, 2020
4b8adeb
Updated os description logic to keep equals ignore match with guest o…
harikrishna-patnala Dec 22, 2020
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
24 changes: 21 additions & 3 deletions ...ge/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,26 @@ public Long retrieveTemplateGuestOsIdFromGuestOsInfo(long templateId, String gue
hypervisor.toString(), minimumHypervisorVersion);

if (CollectionUtils.isNotEmpty(guestOsMappings)) {
GuestOSHypervisorVO mapping = guestOsMappings.get(0);
return mapping.getGuestOsId();
Long guestOsId = null;
if (guestOsMappings.size() == 1) {
GuestOSHypervisorVO mapping = guestOsMappings.get(0);
guestOsId = mapping.getGuestOsId();
} else {
if (!StringUtils.isEmpty(guestOsDescription)) {
for (GuestOSHypervisorVO guestOSHypervisorVO : guestOsMappings) {
Comment thread
DaanHoogland marked this conversation as resolved.
GuestOSVO guestOSVO = guestOSDao.findById(guestOSHypervisorVO.getGuestOsId());
if (guestOsDescription.equalsIgnoreCase(guestOSVO.getDisplayName())) {
guestOsId = guestOSHypervisorVO.getGuestOsId();
break;
}
}
}
if (null == guestOsId) {
Copy link
Copy Markdown
Member

@yadvr yadvr Dec 22, 2020

Choose a reason for hiding this comment

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

Minor nit - I think variable == null maybe more readable, but as I said that's not picking

Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland Dec 22, 2020

Choose a reason for hiding this comment

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

depends on how accustomed you are in right to left reading ;)

Copy link
Copy Markdown
Member Author

@harikrishna-patnala harikrishna-patnala Dec 23, 2020

Choose a reason for hiding this comment

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

making habit of this to avoid setting null to the variable by mistake, in that case IDE also don't know if it is logically wrong "if (guestOsId = null)" :p

GuestOSHypervisorVO mapping = guestOsMappings.get(guestOsMappings.size()-1);
guestOsId = mapping.getGuestOsId();
}
}
return guestOsId;
} else {
throw new CloudRuntimeException("Did not find a guest OS with type " + guestOsType);
}
Expand Down Expand Up @@ -301,7 +319,7 @@ private void persistTemplateDeployAsIsInformationTOList(long templateId,
}
String propValue = null;
try {
propValue = getValueFromInformationTO(informationTO);
propValue = getValueFromInformationTO(informationTO);
} catch (RuntimeException re) {
LOGGER.error("gson marshalling of property object fails: " + propKey,re);
} catch (IOException e) {
Expand Down