76c76
< def makeTopology(self, options, IntLink, ExtLink, Router):
---
> def makeTopology(self, options, network, IntLink, ExtLink, Router):
79,81d78
< routers = []
< int_links = []
< ext_links = []
85c82,83
< routers.append(self.router)
---
> network.routers.append(self.router)
>
88,91c86
< subRouters, subIntLinks, subExtLinks = node.makeTopology(options, IntLink, ExtLink, Router)
< routers += subRouters
< int_links += subIntLinks
< ext_links += subExtLinks
---
> node.makeTopology(options, network, IntLink, ExtLink, Router)
105c100
< int_links.append(link)
---
> network.int_links.append(link)
114c109
< ext_links.append(link)
---
> network.ext_links.append(link)
116,117d110
< return routers, int_links, ext_links
<