42c42
< def makeTopology(self, options, IntLink, ExtLink, Router):
---
> def makeTopology(self, options, network, IntLink, ExtLink, Router):
44d43
< # Create an individual router for each controller, and connect all to all.
45a45
> # Create an individual router for each controller, and connect all to all.
46a47,48
> network.routers = routers
>
49c51
< link_count = len(nodes)
---
> network.ext_links = ext_links
50a53
> link_count = len(nodes)
60c63
< return routers, int_links, ext_links
---
> network.int_links = int_links