From 11411cc9c70fb532798c5c8fb287ad658111ff15 Mon Sep 17 00:00:00 2001 From: Jason Power Date: Fri, 10 Aug 2012 13:50:42 -0500 Subject: Ruby: Clean up topology changes This patch moves instantiateTopology into Ruby.py and removes the mem/ruby/network/topologies directory. It also adds some extra inheritance to the topologies to clean up some issues in the existing topologies. --- configs/topologies/Cluster.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configs/topologies/Cluster.py') diff --git a/configs/topologies/Cluster.py b/configs/topologies/Cluster.py index e5c6dac0e..93bd0d946 100644 --- a/configs/topologies/Cluster.py +++ b/configs/topologies/Cluster.py @@ -115,3 +115,6 @@ class Cluster(BaseTopology): return routers, int_links, ext_links + def __len__(self): + return len([i for i in self.nodes if type(i) != Cluster]) + \ + sum([len(i) for i in self.nodes if type(i) == Cluster]) -- cgit v1.2.3