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 --- tools/report/report.jinja | 3 +++ tools/report/report_rst.jinja | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'tools/report') diff --git a/tools/report/report.jinja b/tools/report/report.jinja index 884cb20e..8354835c 100644 --- a/tools/report/report.jinja +++ b/tools/report/report.jinja @@ -112,6 +112,9 @@ Below are test details: - Traffic type: {{ "%s"|format(test.result['type']) }} - Packet size: {{ "%s"|format(test.result['packet_size']) }} - Bidirectional : {{ "%s"|format(test.conf['biDirectional']) }} +{%- if test.result['tunnel_type'] %} +- Tunnel type: {{ "%s"|format(test.result['tunnel_type']) }} +{%- endif %} {% endfor %} diff --git a/tools/report/report_rst.jinja b/tools/report/report_rst.jinja index 9daa009a..545dd493 100644 --- a/tools/report/report_rst.jinja +++ b/tools/report/report_rst.jinja @@ -35,7 +35,9 @@ Below are test details: * Deployment: {{ "%s"|format(tests[0].deployment) }} * Traffic type: {{ "%s"|format(tests[0].result['type']) }} * Bidirectional : {{ "%s"|format(tests[0].conf['biDirectional']) }} - +{%- if tests[0].result['tunnel_type'] %} +* Tunnel type: {{ "%s"|format(tests[0].result['tunnel_type']) }} +{%- endif %} {% for test in tests %} Test results for packet size: {{ "%s"|format(test.result['packet_size']) }} ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- cgit 1.2.3-korg