Replaced old waiting mechanism in vsphere

Replaced old waiting mechanism in vsphere