Updated VM create/delete criteria

Change-Id: Ie4dd33cea49e98f35a0e46dab88adcae15b16097