From 8ee2450bd267c7dc173f62909a8a4ebe13feab84 Mon Sep 17 00:00:00 2001 From: Dino Simeon Madarang Date: Tue, 2 Feb 2016 08:32:01 +0000 Subject: tunneling: Vanilla OVS decapsulation tests Add Vanilla OVS VXLAN/GRE/GENEVE decapsulation tests Recent changes: * Line wrap * Fix GENEVE IP settings * Add GRE and GENEVE steps to integration.rst * Add DUT_NIC1_MAC and DUT_NIC2_MAC * Remove unnecessary call to vswitch.set_tunnel_arp * Move optional VXLAN/GRE/GENEVE decap settings to a different section * Add tunnel type to report files md and rst * Fix typo error: l4 to L4 in conf/integration/03_traffic.conf Change-Id: I8a43521668d5870ec893aed1df49467f0a84a07d JIRA: VSPERF-180 Signed-off-by: Dino Simeon Madarang Signed-off-by: Martin Klozik Reviewed-by: Maryam Tahhan Reviewed-by: Al Morton Reviewed-by: Brian Castelli --- conf/integration/02_vswitch.conf | 5 +++- conf/integration/03_traffic.conf | 62 +++++++++++++++++++--------------------- 2 files changed, 34 insertions(+), 33 deletions(-) (limited to 'conf/integration') diff --git a/conf/integration/02_vswitch.conf b/conf/integration/02_vswitch.conf index f2fa0a4c..6bdf79d3 100644 --- a/conf/integration/02_vswitch.conf +++ b/conf/integration/02_vswitch.conf @@ -24,4 +24,7 @@ TUNNEL_EXTERNAL_BRIDGE_IP = '192.168.240.1/24' TUNNEL_TYPE = 'vxlan' # The receiving NIC of VXLAN traffic -DUT_NIC1_MAC = '00:1b:21:b3:48:a9' +# Used for OVS Vanilla Decap +DUT_NIC1_MAC = '' +# Used for OVS DPDK Decap +DUT_NIC2_MAC = '' diff --git a/conf/integration/03_traffic.conf b/conf/integration/03_traffic.conf index 501a3ea8..0b46cea0 100644 --- a/conf/integration/03_traffic.conf +++ b/conf/integration/03_traffic.conf @@ -31,15 +31,17 @@ VXLAN_VNI = '99' # 'dstmac': # '00:1b:21:b3:48:a9'} -VXLAN_FRAME_L2 = {'srcmac': '', - 'dstmac': '', +VXLAN_FRAME_L2 = {'srcmac': '01:02:03:04:05:06', + 'dstmac': DUT_NIC2_MAC, } +# VXLAN is supported both in IxNetwork and IXIA IxExplorer # FOR IXIA IxExplorer - VXLAN INNER FRAME # The following lines can be removed if IXIA support will be dropped: # 'protocolpad': 'true', # 'protocolpadbytes': -# '080000000000630006050403020101020304050608004500002e000000004011095bc0a8000ac0a8f0090bb80bb9001a2e93000102030405060708090a0b0c0d0e0f1011', +# '080000000000630006050403020101020304050608004500002e000000004011095bc0a' \ +# '8000ac0a8f0090bb80bb9001a2e93000102030405060708090a0b0c0d0e0f1011', # protocolpadbytes contains the following values: # VxLAN header with VNI 99 (0x63) # Inner SRC 01:02:03:04:05:06 @@ -54,72 +56,68 @@ VXLAN_FRAME_L2 = {'srcmac': '', VXLAN_FRAME_L3 = {'proto': 'udp', 'packetsize': 64, 'srcip': TRAFFICGEN_PORT1_IP, - 'dstip': '', + 'dstip': '192.168.240.1', } -VXLAN_FRAME_l4 = {'srcport': 4789, +VXLAN_FRAME_L4 = {'srcport': 4789, 'dstport': 4789, 'vni': VXLAN_VNI, - 'inner_srcmac': '', - 'inner_dstmac': '', - 'inner_srcip': '', - 'inner_dstip': '', - 'inner_proto': 'tcp', + 'inner_srcmac': '01:02:03:04:05:06', + 'inner_dstmac': '06:05:04:03:02:01', + 'inner_srcip': '192.168.0.10', + 'inner_dstip': '192.168.240.9', + 'inner_proto': 'udp', 'inner_srcport': 3000, 'inner_dstport': 3001, - 'protocolpad': '', - 'protocolpadbytes': '', } # TEST frame # dstmac should be set to the MAC address of the DUT's receiving port -GRE_FRAME_L2 = {'srcmac': '', - 'dstmac': '', +GRE_FRAME_L2 = {'srcmac': '01:02:03:04:05:06', + 'dstmac': DUT_NIC2_MAC, } GRE_FRAME_L3 = {'proto': 'gre', 'packetsize': 64, 'srcip': TRAFFICGEN_PORT1_IP, - 'dstip': '', + 'dstip': '192.168.240.1', } -GRE_FRAME_l4 = {'srcport': 0, +GRE_FRAME_L4 = {'srcport': 0, 'dstport': 0, - 'inner_srcmac': '', - 'inner_dstmac': '', - 'inner_srcip': '', - 'inner_dstip': '', - 'inner_proto': 'tcp', + 'inner_srcmac': '01:02:03:04:05:06', + 'inner_dstmac': '06:05:04:03:02:01', + 'inner_srcip': '192.168.0.10', + 'inner_dstip': '192.168.240.9', + 'inner_proto': 'udp', 'inner_srcport': 3000, 'inner_dstport': 3001, - 'protocolpad': '', - 'protocolpadbytes': '', } # TEST frame # dstmac should be set to the MAC address of the DUT's receiving port -GENEVE_FRAME_L2 = {'srcmac': '', - 'dstmac': '', +GENEVE_FRAME_L2 = {'srcmac': '01:02:03:04:05:06', + 'dstmac': DUT_NIC2_MAC, } GENEVE_FRAME_L3 = {'proto': 'udp', 'packetsize': 64, 'srcip': TRAFFICGEN_PORT1_IP, - 'dstip': '', + 'dstip': '192.168.240.1', } # UDP source/destination port (OUTER FRAME) # Variables with prefix inner_ are for the # INNER_FRAME -GENEVE_FRAME_l4 = {'srcport': 6081, +GENEVE_FRAME_L4 = {'srcport': 6081, 'dstport': 6081, 'geneve_vni': 0, - 'inner_srcmac': '', - 'inner_dstmac': '', - 'inner_srcip': '', - 'inner_dstip': '', - 'inner_proto': 'tcp', + 'inner_srcmac': '01:02:03:04:05:06', + 'inner_dstmac': '06:05:04:03:02:01', + 'inner_srcip': '192.168.0.10', + 'inner_dstip': '192.168.240.9', + 'inner_proto': 'udp', 'inner_srcport': 3000, 'inner_dstport': 3001, } -- cgit 1.2.3-korg