From ef59dd2ca2322e96717684063a2ac1f67042ffd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gon=C3=A9ri=20Le=20Bouder?= Date: Wed, 24 Jul 2019 16:34:50 +0200 Subject: [PATCH] vmware_guest_network: fix the network look up Before this fix, the module was not able to look up a `VM Network` located at `/DC0/network/VM Network`. As a consequence, the test module was failing with a real environment (Non-govcsim). --- lib/ansible/module_utils/vmware.py | 2 +- .../targets/vmware_guest_network/tasks/main.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/ansible/module_utils/vmware.py b/lib/ansible/module_utils/vmware.py index 94bf7aefb75..826f4e72443 100644 --- a/lib/ansible/module_utils/vmware.py +++ b/lib/ansible/module_utils/vmware.py @@ -1195,7 +1195,7 @@ class PyVmomi(object): if len(temp_vm_object.propSet) != 1: continue for temp_vm_object_property in temp_vm_object.propSet: - if temp_vm_object_property.val == self.params['name']: + if temp_vm_object_property.val == network_name: networks.append(temp_vm_object.obj) break return networks diff --git a/test/integration/targets/vmware_guest_network/tasks/main.yml b/test/integration/targets/vmware_guest_network/tasks/main.yml index b80105346a0..e7d38acd8bd 100644 --- a/test/integration/targets/vmware_guest_network/tasks/main.yml +++ b/test/integration/targets/vmware_guest_network/tasks/main.yml @@ -17,7 +17,7 @@ hostname: "{{ vcenter_hostname }}" username: "{{ vcenter_username }}" password: "{{ vcenter_password }}" - name: "{{ infra.vm_list[0] }}" + name: "{{ virtual_machines[0].name }}" gather_network_facts: true register: netadapter_facts @@ -33,7 +33,7 @@ hostname: "{{ vcenter_hostname }}" username: "{{ vcenter_username }}" password: "{{ vcenter_password }}" - name: "{{ infra.vm_list[0] }}" + name: "{{ virtual_machines[0].name }}" networks: - name: "VM Network" state: new @@ -59,7 +59,7 @@ hostname: "{{ vcenter_hostname }}" username: "{{ vcenter_username }}" password: "{{ vcenter_password }}" - name: "{{ infra.vm_list[0] }}" + name: "{{ virtual_machines[0].name }}" networks: - state: absent mac: "00:50:56:58:59:60" @@ -79,7 +79,7 @@ hostname: "{{ vcenter_hostname }}" username: "{{ vcenter_username }}" password: "{{ vcenter_password }}" - name: "{{ infra.vm_list[0] }}" + name: "{{ virtual_machines[0].name }}" networks: - state: present mac: "00:50:56:58:59:61" @@ -100,7 +100,7 @@ hostname: "{{ vcenter_hostname }}" username: "{{ vcenter_username }}" password: "{{ vcenter_password }}" - name: "{{ infra.vm_list[0] }}" + name: "{{ virtual_machines[0].name }}" networks: - name: non-existing-nw manual_mac: "00:50:56:11:22:33"