Fix vmware_guest idempotency when using dvswitch (fixes #498) (#2000)

SUMMARY This fixes the idempotency issue reported in #498 caused by nic.device.deviceInfo.summary containing DVSwitch: d5 6e 22 50 dd f2 94 7b-a6 1f b2 c2 e6 aa 0f instead of a readable portgroup name. ISSUE TYPE Bugfix Pull Request COMPONENT NAME vmware_guest Reviewed-by: Mario Lenz <[email protected]>
ansible-collections · Nov 21, 2024 · e249a03 · e249a03
1 parent 394a5a6
commit e249a03
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/changelogs/fragments/2000-fix-vmware-guest-idempotency-with-dvswitch.yml b/changelogs/fragments/2000-fix-vmware-guest-idempotency-with-dvswitch.yml
@@ -0,0 +1,3 @@
+bugfixes:
+  - vmware_guest - Fix vmware_guest always reporting change when using dvswitch.
+    (https://github.com/ansible-collections/community.vmware/pull/2000).
diff --git a/plugins/modules/vmware_guest.py b/plugins/modules/vmware_guest.py
@@ -1936,8 +1936,15 @@ def configure_network(self, vm_obj):
                     nic_change_detected = True
 
                 if nic.device.deviceInfo.summary != network_name:
-                    nic.device.deviceInfo.summary = network_name
-                    nic_change_detected = True
+                    if 'DVSwitch' not in nic.device.deviceInfo.summary:
+                        nic.device.deviceInfo.summary = network_name
+                        nic_change_detected = True
+                    else:
+                        pg = find_obj(self.content, [vim.DistributedVirtualPortgroup], network_name)
+                        if pg is None or nic.device.backing.port.portgroupKey != pg.key:
+                            nic.device.deviceInfo.summary = network_name
+                            nic_change_detected = True
+
                 if 'device_type' in network_devices[key]:
                     device = self.device_helper.nic_device_type.get(network_devices[key]['device_type'])
                     if not isinstance(nic.device, device):