From a22e2618a6000b9ce478f862e594256f59979314 Mon Sep 17 00:00:00 2001
From: Murphy McCauley <murphy.mccauley@gmail.com>
Date: Thu, 6 Jun 2013 16:18:04 -0700
Subject: [PATCH] topo: Add host count param to LinearTopo
Previously, LinearTopo took one parameter (k), which controlled the number
of switches; each of these got one host. This adds a second parameter (j),
which controls the number of hosts per switch, defaulting to 1 (as before).
This is the second version of this patch, which attempts to make the
host name generation more straightforward.
---
mininet/topo.py | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/mininet/topo.py b/mininet/topo.py
index cae1c04a..cf0ec5b3 100644
--- a/mininet/topo.py
+++ b/mininet/topo.py
@@ -233,21 +233,32 @@ def __init__(self, k=2, **opts):
class LinearTopo(Topo):
"Linear topology of k switches, with one host per switch."
- def __init__(self, k=2, **opts):
+ def __init__(self, k=2, j=1, **opts):
"""Init.
- k: number of switches (and hosts)
+ k: number of switches
+ j: number of hosts per switch
hconf: host configuration options
lconf: link configuration options"""
super(LinearTopo, self).__init__(**opts)
self.k = k
+ self.j = j
+
+ if j == 1:
+ genHostName = lambda i,j: 'h%s' % i
+ else:
+ digits = len(str(j-1))
+ genHostName = lambda i,j: 'h%s%0*d' % (i,digits,j)
lastSwitch = None
for i in irange(1, k):
- host = self.addHost('h%s' % i)
switch = self.addSwitch('s%s' % i)
- self.addLink( host, switch)
+
+ for k in irange(0, j-1):
+ host = self.addHost(genHostName(i, k))
+ self.addLink(host, switch)
+
if lastSwitch:
self.addLink( switch, lastSwitch)
lastSwitch = switch
--
GitLab