Add controller manager to the topology
Add controller manager to TestONTopology
cleanup unused code, and update the interface to match base topology
update test cases to match the new interface for Topology
remove empty line