port infra vms to use new framework
Merge pull request #601 from dajohnso/port_vm

port infra vms to use new framework