simplified DistributedVirtualSwitch namespacing (#40191)

This commit is contained in:
Deric Crago 2018-05-22 06:08:31 -04:00 committed by Abhijeet Kasurde
parent 26ea64cdea
commit 3744b69a40

View file

@ -143,12 +143,7 @@ def find_datastore_by_name(content, datastore_name):
def find_dvs_by_name(content, switch_name): def find_dvs_by_name(content, switch_name):
# https://github.com/vmware/govmomi/issues/879 vmware_distributed_switches = get_all_objs(content, [vim.DistributedVirtualSwitch])
# 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: for dvs in vmware_distributed_switches:
if dvs.name == switch_name: if dvs.name == switch_name: