Correctly namespace ports under switches
Correctly namespace ports under switches

- Fix a bug where you still couldn't make two ports with the same name, even
  on differnet switches
- Correctly search for ports (three times)

As a side effect, this removes three of the lines of code that were not
covered.

henn/haas,meng-sun/hil,henn/hil_sahil,SahilTikale/haas,henn/hil_sahil,kylehogan/hil,kylehogan/hil,henn/hil,henn/hil,SahilTikale/switchHaaS,apoorvemohan/haas,meng-sun/hil,lokI8/haas,apoorvemohan/haas,CCI-MOC/haas,kylehogan/haas