37,41c37,41
< def makeTopology(self, options, IntLink, ExtLink, Router):
< # Create an individual router for each controller plus one more for the
< # centralized crossbar. The large numbers of routers are needed because
< # external links do not model outgoing bandwidth in the simple network, but
< # internal links do.
---
> def makeTopology(self, options, network, IntLink, ExtLink, Router):
> # Create an individual router for each controller plus one more for
> # the centralized crossbar. The large numbers of routers are needed
> # because external links do not model outgoing bandwidth in the
> # simple network, but internal links do.
43a44,46
> xbar = routers[len(self.nodes)] # the crossbar router is the last router created
> network.routers = routers
>
45a49,50
> network.ext_links = ext_links
>
47d51
< xbar = routers[len(self.nodes)] # the crossbar router is the last router created
51,52c55
<
< return routers, int_links, ext_links
---
> network.int_links = int_links