Change AddRoute signature to use ep structs, factor out functions for testability, add unit tests for said functions
Merge pull request #486 from pweil-/issue-403-cherry-pick

Merged by openshift-bot