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

Fix mismatch from OVF nic adapter type and expected adapter type string

This commit is contained in:
nvazquez 2020-09-29 00:06:25 -03:00 committed by Harikrishna Patnala
parent 32d85b0fa2
commit 667cb53772
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -2229,7 +2229,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
s_logger.info("Prepare NIC device based on NicTO: " + _gson.toJson(nicTo));
String adapterTypeStr = deployAsIs ?
deployAsIsInfo.getNicAdapterMap().get(nicTo.getDeviceId()) :
mapAdapterType(deployAsIsInfo.getNicAdapterMap().get(nicTo.getDeviceId())) :
vmSpec.getDetails().get(VmDetailConstants.NIC_ADAPTER);
nicDeviceType = VirtualEthernetCardType.valueOf(adapterTypeStr);
@ -2402,6 +2402,19 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
}
}
private String mapAdapterType(String adapterStringFromOVF) {
if (StringUtils.isBlank(adapterStringFromOVF) || adapterStringFromOVF.equalsIgnoreCase(VirtualEthernetCardType.E1000.toString())) {
return VirtualEthernetCardType.E1000.toString();
} else if (adapterStringFromOVF.equalsIgnoreCase(VirtualEthernetCardType.PCNet32.toString())) {
return VirtualEthernetCardType.PCNet32.toString();
} else if (adapterStringFromOVF.equalsIgnoreCase(VirtualEthernetCardType.Vmxnet2.toString())) {
return VirtualEthernetCardType.Vmxnet2.toString();
} else if (adapterStringFromOVF.equalsIgnoreCase(VirtualEthernetCardType.Vmxnet3.toString())) {
return VirtualEthernetCardType.Vmxnet3.toString();
}
return VirtualEthernetCardType.E1000.toString();
}
private int getDisksChangesNumberFromDisksSpec(DiskTO[] disks, boolean deployAsIs) {
if (!deployAsIs) {
return disks.length;