Adding wait_till_vm_is_up in encap and evpn cases
Change-Id: I3a304eb70e17577aeac51ce49df4ee84639059f1