aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel Ganne <gabriel.ganne@enea.com>2017-11-15 10:55:22 +0100
committerDave Wallace <dwallacelf@gmail.com>2017-11-15 15:43:11 +0000
commit3904a0c72baefd5c48bf789105266a501ee2bf4c (patch)
treeca30f1180b8d4f87c3fe168cea3dc0fda2596370
parenteb9e6b6f07499e095e7b6b6148be3d7ca27e180f (diff)
vxlan extended tests - fix scapy-related issues
- Add vxlan-gpe binding on udp port 4790 (taken from scapy upstream) - VXLAN.VNI -> VXLAN.vni Change-Id: If7ad38fa04fbfec01e01c81a06e88ffe70183672 Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
-rw-r--r--test/patches/scapy-2.3.3/vxlan.patch11
-rw-r--r--test/test_vxlan_gpe.py2
2 files changed, 12 insertions, 1 deletions
diff --git a/test/patches/scapy-2.3.3/vxlan.patch b/test/patches/scapy-2.3.3/vxlan.patch
new file mode 100644
index 00000000000..556df4dd70a
--- /dev/null
+++ b/test/patches/scapy-2.3.3/vxlan.patch
@@ -0,0 +1,11 @@
+diff --git a/scapy/layers/vxlan.py b/scapy/layers/vxlan.py
+--- a/scapy/layers/vxlan.py
++++ b/scapy/layers/vxlan.py
+@@ -65,6 +65,7 @@
+ return self.sprintf("VXLAN (vni=%VXLAN.vni%)")
+
+ bind_layers(UDP, VXLAN, dport=4789) # RFC standard port
++bind_layers(UDP, VXLAN, dport=4790) # RFC standard vxlan-gpe port
+ bind_layers(UDP, VXLAN, dport=6633) # New IANA assigned port for use with NSH
+ bind_layers(UDP, VXLAN, dport=8472) # Linux implementation port
+ bind_layers(VXLAN, Ether, {'flags': 0x8})
diff --git a/test/test_vxlan_gpe.py b/test/test_vxlan_gpe.py
index 40975bf16f3..762e0709f13 100644
--- a/test/test_vxlan_gpe.py
+++ b/test/test_vxlan_gpe.py
@@ -72,7 +72,7 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
# could be arbitrary.
self.assertEqual(pkt[UDP].dport, type(self).dport)
# Verify VNI
- self.assertEqual(pkt[VXLAN].VNI, vni)
+ self.assertEqual(pkt[VXLAN].vni, vni)
def test_decap(self):
""" Decapsulation test