finish vport refactor, update integration test