Refactor networkmodel OpenRoadmTopology Part 2