Topology Manager changes for cross checking Production switches