commit b1cef5c12db27ba667cafcf96cfadf62d632367d
author Carolina Fernandez <carolina.fernandez@i2cat.net> Tue Nov 22 19:18:40 2016 +0100
committer Thomas Vachuska <tom@onlab.us> Fri Dec 02 21:15:12 2016 +0000
tree f1aed9860c21f14b6d6eb56d985f0ded2039f52c
parent bee19498b5b71d69cc0a4a8e47e5b866b88eca6e

[ONOS-5420] CP/untagged ifaces support in VPLS

Changes:
- Tests to account for tag-tag and tag-notag connectivity
- Introducing untagged ifaces in netcfg and topo files

Change-Id: If56fd4d8bbe4f1f2505e4d5d85c3eeda8c22ac5c

tools/test/topos/vpls.py

diff --git a/tools/test/topos/vpls.py b/tools/test/topos/vpls.py
index 0124541..35e593b 100755
--- a/tools/test/topos/vpls.py
+++ b/tools/test/topos/vpls.py
@@ -11,7 +11,7 @@
 class VLANHost( Host ):
     "Host connected to VLAN interface"
 
-    def config( self, vlan=100, **params ):
+    def config( self, vlan=10, **params ):
         """Configure VLANHost according to (optional) parameters:
            vlan: VLAN ID for default interface"""
 
@@ -43,22 +43,32 @@
         s2 = self.addSwitch('s2')
         s3 = self.addSwitch('s3')
         s4 = self.addSwitch('s4')
+        s5 = self.addSwitch('s5')
 
-        v100h1 = self.addHost('v100h1', cls=VLANHost, vlan=100, mac='00:00:00:00:00:01')
-        v200h1 = self.addHost('v200h1', cls=VLANHost, vlan=200, mac='00:00:00:00:00:02')
-        v300h1 = self.addHost('v300h1', cls=VLANHost, vlan=300, mac='00:00:00:00:00:03')
-        v400h1 = self.addHost('v400h1', cls=VLANHost, vlan=400, mac='00:00:00:00:00:04')
+        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')
 
-        self.addLink(s1, v100h1, port1=1, port2=0)
-        self.addLink(s2, v200h1, port1=1, port2=0)
-        self.addLink(s3, v300h1, port1=1, port2=0)
-        self.addLink(s4, v400h1, port1=1, port2=0)
+        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, s4)
         self.addLink(s1, s2)
         self.addLink(s2, s4)
         self.addLink(s2, s3)
         self.addLink(s3, s4)
+        self.addLink(s3, s5)
 
 topos = { 'vpls': ( lambda: VplsTopo() ) }