rafaelweingartner commented on a change in pull request #2365:
CLOUDSTACK-10197: Rename xentools iso for XenServer 7.0+
URL: https://github.com/apache/cloudstack/pull/2365#discussion_r158563800
##########
File path:
plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
##########
@@ -2590,7 +2590,9 @@ public SR getISOSRbyVmName(final Connection conn, final
String vmName) {
public VDI getIsoVDIByURL(final Connection conn, final String vmName,
final String isoURL) {
SR isoSR = null;
String mountpoint = null;
- if (isoURL.startsWith("xs-tools")) {
+ // XenServer 7.0+ => guest-tools.iso
+ // XenServer [other] => xs-tools.iso
+ if (isoURL.startsWith("xs-tools") || isoURL.startsWith("guest-tools"))
{
Review comment:
Is it possible for `isoURL` to be null? If not, it is ok the way it is.
Otherwise, it might be a good idea to use StringUtils.startsWith
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
