Consolidate portmapping-topo for XPDR