VMware: Add NIC configuration option (#33851)

This fix adds following configurable parameters to virtual network card
of virtual machine.
* WakeOnLanEnabled
* StartConnected
* AllowGuestControl

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
This commit is contained in:
Abhijeet Kasurde 2017-12-15 17:54:52 +05:30 committed by GitHub
parent b2bc98c161
commit b5318e2c34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 88 additions and 4 deletions

View file

@ -180,6 +180,9 @@ options:
- ' - C(gateway) (string): Static gateway.' - ' - C(gateway) (string): Static gateway.'
- ' - C(dns_servers) (string): DNS servers for this network interface (Windows).' - ' - C(dns_servers) (string): DNS servers for this network interface (Windows).'
- ' - C(domain) (string): Domain name for this network interface (Windows).' - ' - C(domain) (string): Domain name for this network interface (Windows).'
- ' - C(wake_on_lan) (bool): Indicates if wake-on-LAN is enabled on this virtual network adapter. version_added: 2.5'
- ' - C(start_connected) (bool): Indicates that virtual network adapter starts with associated virtual machine powers on. version_added: 2.5'
- ' - C(allow_guest_control) (bool): Enables guest control over whether the connectable device is connected. version_added: 2.5'
version_added: '2.3' version_added: '2.3'
customization: customization:
description: description:
@ -474,13 +477,13 @@ class PyVmomiDeviceHelper(object):
else: else:
self.module.fail_json(msg='Invalid device_type "%s" for network "%s"' % (device_type, device_infos['name'])) self.module.fail_json(msg='Invalid device_type "%s" for network "%s"' % (device_type, device_infos['name']))
nic.device.wakeOnLanEnabled = True nic.device.wakeOnLanEnabled = bool(device_infos.get('wake_on_lan', True))
nic.device.deviceInfo = vim.Description() nic.device.deviceInfo = vim.Description()
nic.device.deviceInfo.label = device_label nic.device.deviceInfo.label = device_label
nic.device.deviceInfo.summary = device_infos['name'] nic.device.deviceInfo.summary = device_infos['name']
nic.device.connectable = vim.vm.device.VirtualDevice.ConnectInfo() nic.device.connectable = vim.vm.device.VirtualDevice.ConnectInfo()
nic.device.connectable.startConnected = True nic.device.connectable.startConnected = bool(device_infos.get('start_connected', True))
nic.device.connectable.allowGuestControl = True nic.device.connectable.allowGuestControl = bool(device_infos.get('allow_guest_control', True))
nic.device.connectable.connected = True nic.device.connectable.connected = True
if 'mac' in device_infos and self.is_valid_mac_addr(device_infos['mac']): if 'mac' in device_infos and self.is_valid_mac_addr(device_infos['mac']):
nic.device.addressType = 'manual' nic.device.addressType = 'manual'
@ -844,6 +847,19 @@ class PyVmomiHelper(PyVmomi):
"The failing new MAC address is %s" % nic.device.macAddress) "The failing new MAC address is %s" % nic.device.macAddress)
nic.device = current_net_devices[key] nic.device = current_net_devices[key]
if ('wake_on_lan' in network_devices[key] and
nic.device.wakeOnLanEnabled != network_devices[key].get('wake_on_lan')):
nic.device.wakeOnLanEnabled = network_devices[key].get('wake_on_lan')
nic_change_detected = True
if ('start_connected' in network_devices[key] and
nic.device.connectable.startConnected != network_devices[key].get('start_connected')):
nic.device.connectable.startConnected = network_devices[key].get('start_connected')
nic_change_detected = True
if ('allow_guest_control' in network_devices[key] and
nic.device.connectable.allowGuestControl != network_devices[key].get('allow_guest_control')):
nic.device.connectable.allowGuestControl = network_devices[key].get('allow_guest_control')
nic_change_detected = True
nic.device.deviceInfo = vim.Description() nic.device.deviceInfo = vim.Description()
else: else:
nic.operation = vim.vm.device.VirtualDeviceSpec.Operation.add nic.operation = vim.vm.device.VirtualDeviceSpec.Operation.add

View file

@ -22,7 +22,7 @@
port: 443 port: 443
state: started state: started
- name: get a list of VMS from vcsim - name: get a list of VMS from vcsim
uri: uri:
url: http://{{ vcsim }}:5000/govc_find?filter=VM url: http://{{ vcsim }}:5000/govc_find?filter=VM
register: vmlist register: vmlist

View file

@ -0,0 +1,67 @@
# Test code for the vmware_guest module.
# Copyright: (c) 2017, Abhijeet Kasurde <akasurde@redhat.com>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
- name: Wait for Flask controller to come up online
wait_for:
host: "{{ vcsim }}"
port: 5000
state: started
- name: kill vcsim
uri:
url: http://{{ vcsim }}:5000/killall
- name: start vcsim with no folders
uri:
url: http://{{ vcsim }}:5000/spawn?datacenter=1&cluster=1&folder=0
register: vcsim_instance
- name: Wait for Flask controller to come up online
wait_for:
host: "{{ vcsim }}"
port: 443
state: started
- name: get a list of VMS from vcsim
uri:
url: http://{{ vcsim }}:5000/govc_find?filter=VM
register: vmlist
- debug: var=vcsim_instance
- debug: var=vmlist
- name: create new VMs
vmware_guest:
validate_certs: False
hostname: "{{ vcsim }}"
username: "{{ vcsim_instance['json']['username'] }}"
password: "{{ vcsim_instance['json']['password'] }}"
name: "{{ 'newvmnw_' + item|basename }}"
guest_id: centos64Guest
datacenter: "{{ (item|basename).split('_')[0] }}"
hardware:
num_cpus: 4
memory_mb: 512
disk:
- size: 0gb
type: thin
autoselect_datastore: True
networks:
- name: 'VM Network'
device_type: vmxnet3
ip: 192.168.10.1
netmask: 255.255.255.0
wake_on_lan: True
start_connected: True
allow_guest_control: True
state: poweredoff
folder: "{{ item|dirname }}"
with_items: "{{ vmlist['json'] }}"
register: clone_d1_c1_f0
- debug: var=clone_d1_c1_f0
- name: assert that changes were made
assert:
that:
- "clone_d1_c1_f0.results|map(attribute='changed')|unique|list == [true]"

View file

@ -22,4 +22,5 @@
- include: create_guest_invalid_d1_c1_f0.yml - include: create_guest_invalid_d1_c1_f0.yml
- include: mac_address_d1_c1_f0.yml - include: mac_address_d1_c1_f0.yml
- include: disk_type_d1_c1_f0.yml - include: disk_type_d1_c1_f0.yml
- include: create_nw_d1_c1_f0.yml
#- include: template_d1_c1_f0.yml #- include: template_d1_c1_f0.yml