Provide comparator routines for Peer

Remove the map used to store Peer entries
Add two new peer's ECMP and local-vm-port. Code to use the new peer will
come later