commit 6ca22c031117d159a416182c62f6c1f9c691e5e2
author Andy Bavier <andy@opennetworking.org> Tue Apr 02 14:03:49 2019 -0700
committer Andy Bavier <andy@opennetworking.org> Fri Apr 19 10:42:13 2019 -0700
tree be23678f149ca5c0e022b757135f94a6de731dec
parent e68bbde639259275c31a630984793d5b5c3518bf

SEBA-564 Use Mininet image with OvS 2.9.0 for QinQ matching

Change-Id: I75e710747ebfc9d91a6352ce9999770ffd74d4eb

mininet/toposcripts/topo.py

diff --git a/mininet/toposcripts/topo.py b/mininet/toposcripts/topo.py
index 8a89515..0c9c7cf 100644
--- a/mininet/toposcripts/topo.py
+++ b/mininet/toposcripts/topo.py
@@ -35,6 +35,7 @@
     print quietRun( 'apt-get -y install dnsmasq ethtool' )
 
     info( '*** Creating network\n' )
+    print quietRun( 'ovs-vsctl set Open_vSwitch . other_config:vlan-limit={{ .Values.vlanMatchDepth }}' )
     OVSSwitch13 = partial( OVSSwitch, protocols='OpenFlow13' )
     controllerIp = socket.gethostbyname( '{{ .Values.onosOpenflowSvc }}' )
     net = Mininet( topo=SingleSwitchTopo(1),
@@ -51,8 +52,8 @@
 
     bgphost = net.hosts [ 0 ]
     info( '*** Adding VLAN interface to host\n')
-    bgphost.cmd( 'ip link add link h1-eth0 name h1-eth0.222 type vlan id 222' )
-    bgphost.cmd( 'ip link add link h1-eth0.222 name h1-eth0.222.111 type vlan id 111' )
+    bgphost.cmd( 'ip link add link h1-eth0 name h1-eth0.222 type vlan proto 802.1Q id 222' )
+    bgphost.cmd( 'ip link add link h1-eth0.222 name h1-eth0.222.111 type vlan proto 802.1Q id 111' )
     bgphost.cmd( 'ifconfig h1-eth0.222 up' )
     bgphost.cmd( 'ifconfig h1-eth0.222.111 up' )
     bgphost.cmd( 'ifconfig h1-eth0.222.111 172.18.0.10/24' )