wait for server deletion in delete

Change-Id: Ibd412b52c5f16e9690e98a0e9c84dd8094ffa108