Merge "Mapping tap port to vpp"