commit 9829bf1207314b7dfe3675cb3502c8bb3233eb03
author Luca Prete <luca@onlab.us> Thu Nov 10 21:49:53 2016 -0800
committer Luca Prete <luca@onlab.us> Mon Dec 05 10:11:50 2016 -0800
tree b3e546074c0bc570516b2366e3031aa3f2202710
parent dce16f892fe5ef77c1476ece1278415de8f1f8fc

demoTopo

Change-Id: I89c9dd86bc2615fd953691488105d004a38ce022

tools/test/topos/vpls.py

diff --git a/tools/test/topos/vpls.py b/tools/test/topos/vpls.py
index 35e593b..0be2e68 100755
--- a/tools/test/topos/vpls.py
+++ b/tools/test/topos/vpls.py
@@ -44,31 +44,31 @@
         s3 = self.addSwitch('s3')
         s4 = self.addSwitch('s4')
         s5 = self.addSwitch('s5')
+        s6 = self.addSwitch('s6')
 
-        vpls1h1 = self.addHost('vpls1h1', cls=VLANHost, vlan=10, mac='00:00:00:00:00:01')
-        vpls1h2 = self.addHost('vpls1h2', cls=VLANHost, vlan=10, mac='00:00:00:00:00:02')
-        vpls1h3 = self.addHost('vpls1h3', cls=VLANHost, vlan=20, mac='00:00:00:00:00:03')
-        vpls2h1 = self.addHost('vpls2h1', cls=VLANHost, vlan=30, mac='00:00:00:00:00:04')
-        vpls2h2 = self.addHost('vpls2h2', cls=VLANHost, vlan=40, mac='00:00:00:00:00:05')
-        vpls2h3 = self.addHost('vpls2h3', mac='00:00:00:00:00:06')
-        vpls3h1 = self.addHost('vpls3h1', mac='00:00:00:00:00:07')
-        vpls3h2 = self.addHost('vpls3h2', mac='00:00:00:00:00:08')
+        h1 = self.addHost('h1', cls=VLANHost, vlan=100, mac='00:00:00:00:00:01')
+        h2 = self.addHost('h2', cls=VLANHost, vlan=200, mac='00:00:00:00:00:02')
+        h3 = self.addHost('h3', cls=VLANHost, vlan=300, mac='00:00:00:00:00:03')
+        h4 = self.addHost('h4', cls=VLANHost, vlan=400, mac='00:00:00:00:00:04')
+        h5 = self.addHost('h5', mac='00:00:00:00:00:05')
+        h6 = self.addHost('h6', mac='00:00:00:00:00:06')
 
-        self.addLink(s1, vpls1h1, port1=1, port2=0)
-        self.addLink(s2, vpls2h2, port1=1, port2=0)
-        self.addLink(s3, vpls1h3, port1=1, port2=0)
-        self.addLink(s3, vpls3h1, port1=2, port2=0)
-        self.addLink(s4, vpls1h2, port1=1, port2=0)
-        self.addLink(s4, vpls2h1, port1=2, port2=0)
-        self.addLink(s4, vpls2h3, port1=3, port2=0)
-        self.addLink(s5, vpls3h2, port1=1, port2=0)
+        self.addLink(s1, h1, port1=1, port2=0)
+        self.addLink(s2, h2, port1=1, port2=0)
+        self.addLink(s3, h3, port1=1, port2=0)
+        self.addLink(s4, h4, port1=1, port2=0)
+        self.addLink(s5, h5, port1=1, port2=0)
+        self.addLink(s6, h6, port1=1, port2=0)
 
-        self.addLink(s1, s4)
         self.addLink(s1, s2)
-        self.addLink(s2, s4)
         self.addLink(s2, s3)
         self.addLink(s3, s4)
-        self.addLink(s3, s5)
+        self.addLink(s4, s1)
+        self.addLink(s4, s2)
+        self.addLink(s1, s5)
+        self.addLink(s4, s5)
+        self.addLink(s2, s6)
+        self.addLink(s3, s6)
 
 topos = { 'vpls': ( lambda: VplsTopo() ) }