From 2d501276429ab674c146a86802e62538892fc500 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Fri, 22 Mar 2013 15:53:22 -0500 Subject: ruby: network: move routers from topology to network --- configs/ruby/Ruby.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'configs/ruby') diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py index 88a0acd49..6859b044e 100644 --- a/configs/ruby/Ruby.py +++ b/configs/ruby/Ruby.py @@ -149,18 +149,17 @@ def create_system(options, system, piobus = None, dma_ports = []): routers, int_links, ext_links = topology.makeTopology(options, IntLinkClass, ExtLinkClass, RouterClass) - net_topology.routers = routers + net_topology.num_routers = len(routers) net_topology.int_links = int_links net_topology.ext_links = ext_links + network = NetworkClass(ruby_system = ruby, topology = net_topology, + routers = routers) if options.network_fault_model: assert(options.garnet_network == "fixed") - fault_model = FaultModel() - network = NetworkClass(ruby_system = ruby, topology = net_topology,\ - enable_fault_model=True, fault_model = fault_model) - else: - network = NetworkClass(ruby_system = ruby, topology = net_topology) + network.enable_fault_model = True + network.fault_model = FaultModel() # # Loop through the directory controlers. -- cgit v1.2.3