Refactor TAPI ConvertORToTapiTopology