update topology after rotations and upgrades

Change-Id: I1a7d7fc111858d596f5e957a914c4d54c0b62fb9