SEBA-564 Use Mininet image with OvS 2.9.0 for QinQ matching
Change-Id: I75e710747ebfc9d91a6352ce9999770ffd74d4eb
diff --git a/configs/seba-ponsim.yaml b/configs/seba-ponsim.yaml
index b3753fa..3567d6b 100644
--- a/configs/seba-ponsim.yaml
+++ b/configs/seba-ponsim.yaml
@@ -33,3 +33,6 @@
# this is mandatory, it's needed to correctly configure the kafka endpoint
kafkaService: cord-kafka
+
+# in mininet chart
+vlanMatchDepth: 1
diff --git a/mininet/Chart.yaml b/mininet/Chart.yaml
index ba62bad..39568c7 100644
--- a/mininet/Chart.yaml
+++ b/mininet/Chart.yaml
@@ -17,4 +17,4 @@
appVersion: "1.0"
description: A Helm chart for Mininet
name: mininet
-version: 0.2.0
+version: 0.3.0
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' )
diff --git a/mininet/values.yaml b/mininet/values.yaml
index 32a6fea..3670bef 100644
--- a/mininet/values.yaml
+++ b/mininet/values.yaml
@@ -23,7 +23,7 @@
image:
repository: ciena/mininet
- tag: latest
+ tag: ubuntu-bionic
pullPolicy: IfNotPresent
resources: {}
@@ -49,3 +49,4 @@
cni: "calico,pon1"
onosOpenflowSvc: "onos-openflow.default.svc.cluster.local"
+vlanMatchDepth: 2