Fallback to the newer object type for dvswitch

7 years ago · 940bf1f627
parent cc287daa3b
commit 940bf1f627
1 changed files with 7 additions and 1 deletions
--- a/lib/ansible/module_utils/vmware.py
+++ b/lib/ansible/module_utils/vmware.py
@ -157,7 +157,13 @@ def find_datastore_by_name(content, datastore_name):

 def find_dvs_by_name(content, switch_name):

-    vmware_distributed_switches = get_all_objs(content, [vim.dvs.VmwareDistributedVirtualSwitch])
+    # https://github.com/vmware/govmomi/issues/879
+    # https://github.com/ansible/ansible/pull/31798#issuecomment-336936222
+    try:
+        vmware_distributed_switches = get_all_objs(content, [vim.dvs.VmwareDistributedVirtualSwitch])
+    except IndexError:
+        vmware_distributed_switches = get_all_objs(content, [vim.DistributedVirtualSwitch])
+
    for dvs in vmware_distributed_switches:
        if dvs.name == switch_name:
            return dvs