cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

vmware_guest: add support for more virtual NICs (#19932)

Browse source 
This patch adds support for all other virtual NICs, including:

 - pcnet32
 - vmxnet2
 - e1000e
 - sriov

Without this change, VMs with one of these NICs will fail with a
fault.NicSettingMismatch.summary error as it will only add interfaces,
not edit these.

This fixes #19860
This commit is contained in:
Dag Wieers 2017-01-05 18:16:21 +01:00 • committed by René Moser
parent 38d42e8b36
commit 9ddcf16b4b
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/ansible/modules/cloud/vmware/vmware_guest.py
View file

@ -420,12 +420,20 @@ class PyVmomiDeviceHelper(object):
def create_nic(self, device_type, device_label, device_infos): def create_nic(self, device_type, device_label, device_infos):
nic = vim.vm.device.VirtualDeviceSpec() nic = vim.vm.device.VirtualDeviceSpec()
if device_type == 'vmxnet3': if device_type == 'pcnet32':
nic.device = vim.vm.device.VirtualPCNet32()
if device_type == 'vmxnet2':
nic.device = vim.vm.device.VirtualVmxnet2()
elif device_type == 'vmxnet3':
nic.device = vim.vm.device.VirtualVmxnet3() nic.device = vim.vm.device.VirtualVmxnet3()
elif device_type == 'e1000': elif device_type == 'e1000':
nic.device = vim.vm.device.VirtualE1000() nic.device = vim.vm.device.VirtualE1000()
elif device_type == 'e1000e':
nic.device = vim.vm.device.VirtualE1000e()
elif device_type == 'sriov':
nic.device = vim.vm.device.VirtualSriovEthernetCard()
else: else:
self.module.fail_json(msg="invalid device_type '%s' for network %s" % self.module.fail_json(msg="Invalid device_type '%s' for network %s" %
(device_type, device_infos['network'])) (device_type, device_infos['network']))
nic.device.wakeOnLanEnabled = True nic.device.wakeOnLanEnabled = True
@ -828,7 +836,12 @@ class PyVmomiHelper(object):
device_list = [] device_list = []
for device in vm.config.hardware.device: for device in vm.config.hardware.device:
if isinstance(device, vim.vm.device.VirtualVmxnet3) or isinstance(device, vim.vm.device.VirtualE1000): if isinstance(device, vim.vm.device.VirtualPCNet32) or \
isinstance(device, vim.vm.device.VirtualVmxnet2) or \
isinstance(device, vim.vm.device.VirtualVmxnet3) or \
isinstance(device, vim.vm.device.VirtualE1000) or \
isinstance(device, vim.vm.device.VirtualE1000e) or \
isinstance(device, vim.vm.device.VirtualSriovEthernetCard):
device_list.append(device) device_list.append(device)
return device_list return device_list