Update to AutoGOLE topologies to be inline with NSI draft