Refactor TAPI topology ConvertORToTapiTopology