Use higher IP in next-hop IP test to avoid clash with HSRP IPs
Change port test to accomodate HSRP interfaces
Merge branch 'master' of https://github.com/onecloud/tempest