Skip to content
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.

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

VMware: Set default network type as 'dhcp' #38518

Merged
merged 1 commit into from
Apr 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/ansible/modules/cloud/vmware/vmware_guest.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
- ' - C(device_type) (string): Virtual network device (one of C(e1000), C(e1000e), C(pcnet32), C(vmxnet2), C(vmxnet3) (default), C(sriov)).'
- ' - C(mac) (string): Customize MAC address.'
- 'Optional parameters per entry (used for OS customization):'
- ' - C(type) (string): Type of IP assignment (either C(dhcp) or C(static)).'
- ' - C(type) (string): Type of IP assignment (either C(dhcp) or C(static)). C(dhcp) is default.'
- ' - C(ip) (string): Static IP address (implies C(type: static)).'
- ' - C(netmask) (string): Static netmask required for C(ip).'
- ' - C(gateway) (string): Static gateway.'
Expand Down Expand Up @@ -1019,6 +1019,9 @@ def sanitize_network_params(self):
# network type as 'static'
if 'ip' in network or 'netmask' in network:
network['type'] = 'static'
else:
# User wants network type as 'dhcp'
network['type'] = 'dhcp'

if network.get('type') == 'static':
if 'ip' in network and 'netmask' not in network:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

- debug: var=non_existent_network

- name: assert that no changes were made
- name: assert that no changes were not made
assert:
that:
- "not non_existent_network.changed"
Expand Down Expand Up @@ -94,7 +94,7 @@

- debug: var=no_netmask

- name: assert that no changes were made
- name: assert that no changes were not made
assert:
that:
- "not no_netmask.changed"
Expand Down Expand Up @@ -127,7 +127,7 @@

- debug: var=no_ip

- name: assert that changes were made
- name: assert that changes were not made
assert:
that:
- "not no_ip.changed"
Expand Down Expand Up @@ -160,7 +160,7 @@

- debug: var=no_network_name

- name: assert that no changes were made
- name: assert that no changes were not made
assert:
that:
- "not no_network_name.changed"
Expand Down Expand Up @@ -193,7 +193,7 @@

- debug: var=no_network

- name: assert that changes were made
- name: assert that changes were not made
assert:
that:
- "not no_network.changed"
Expand Down Expand Up @@ -227,7 +227,7 @@

- debug: var=invalid_device_type

- name: assert that changes were made
- name: assert that changes were not made
assert:
that:
- "not invalid_device_type.changed"
Expand Down Expand Up @@ -262,7 +262,7 @@

- debug: var=invalid_mac

- name: assert that changes were made
- name: assert that changes were not made
assert:
that:
- "not invalid_mac.changed"
Expand Down Expand Up @@ -298,7 +298,7 @@

- debug: var=invalid_network_type

- name: assert that changes were made
- name: assert that changes were not made
assert:
that:
- "not invalid_network_type.changed"
Expand Down Expand Up @@ -334,8 +334,38 @@

- debug: var=invalid_dhcp_network_type

- name: assert that changes were made
- name: assert that changes were not made
assert:
that:
- "not invalid_dhcp_network_type.changed"
- "\"Static IP information provided for network\" in invalid_dhcp_network_type.msg"

- name: create new VMs with no network type which set network type as "DHCP"
vmware_guest:
validate_certs: False
hostname: "{{ vcsim }}"
username: "{{ vcsim_instance['json']['username'] }}"
password: "{{ vcsim_instance['json']['password'] }}"
name: new_vm_no_nw_type
guest_id: centos64Guest
datacenter: "{{ (vm1 | basename).split('_')[0] }}"
disk:
- size: 3mb
type: thin
autoselect_datastore: yes
networks:
- name: "VM Network"
hardware:
num_cpus: 3
memory_mb: 512
state: poweredoff
folder: "{{ vm1 | dirname }}"
register: no_network_type
ignore_errors: yes

- debug: var=no_network_type

- name: assert that changes were made
assert:
that:
- "no_network_type.changed"