summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Klozik <martinx.klozik@intel.com>2016-01-26 14:32:01 +0000
committerMaryam Tahhan <maryam.tahhan@intel.com>2016-01-28 15:53:14 +0000
commit35cc59470bf86e33ca4fe30b459e224b2f4cf399 (patch)
treeed776683bfc7022a385249af7553c03fa1e09e85
parent00f09149caf0c0e23c91d147f0e7cfb30d197920 (diff)
bugfix: do not report DPDK version for vanilla OVS vswitch
DPDK version check has been removed in case that OVS does not use DPDK. Change-Id: I78560a72e4fde3d7113165d88eb81d80f6399af8 JIRA: VSPERF-209 Signed-off-by: Martin Klozik <martinx.klozik@intel.com> Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com> Reviewed-by: Al Morton <acmorton@att.com> Reviewed-by: Brian Castelli <brian.castelli@spirent.com> (cherry picked from commit 8744bcc583c734caf006116b033362e01022f7b8)
-rw-r--r--tools/report/report.jinja2
-rw-r--r--tools/report/report.py4
-rw-r--r--tools/report/report_rst.jinja2
3 files changed, 7 insertions, 1 deletions
diff --git a/tools/report/report.jinja b/tools/report/report.jinja
index 60fccd00..4b85bda2 100644
--- a/tools/report/report.jinja
+++ b/tools/report/report.jinja
@@ -89,7 +89,9 @@ Below is the environment that the test was performed in:
- vswitchperf: GIT tag: {{tests[0].env.vsperf['git_tag']}}
- Traffic Generator: {{tests[0].env.traffic_gen['name']}}, Version: {{tests[0].env.traffic_gen['version']}}, GIT tag: {{tests[0].env.traffic_gen['git_tag']}}
- vSwitch: {{tests[0].env.vswitch['name']}}, Version: {{tests[0].env.vswitch['version']}}, GIT tag: {{tests[0].env.vswitch['git_tag']}}
+{%- if 'dpdk' in tests[0].env %}
- DPDK Version: {{tests[0].env.dpdk['version']}}, GIT tag: {{tests[0].env.dpdk['git_tag']}}
+{%- endif %}
{%- if 'vnf' in tests[0].env %}
- VNF: {{tests[0].env.vnf['name']}}, Version: {{tests[0].env.vnf['version']}}, GIT tag: {{tests[0].env.vnf['git_tag']}}
- VM images:{% for guest_image in tests[0].env.guest_image %}
diff --git a/tools/report/report.py b/tools/report/report.py
index 1e0f87bc..16ef0eb3 100644
--- a/tools/report/report.py
+++ b/tools/report/report.py
@@ -56,9 +56,11 @@ def _get_env(result):
'vsperf': systeminfo.get_version('vswitchperf'),
'traffic_gen': systeminfo.get_version(S.getValue('TRAFFICGEN')),
'vswitch': systeminfo.get_version(S.getValue('VSWITCH')),
- 'dpdk': systeminfo.get_version('dpdk'),
}
+ if S.getValue('VSWITCH').lower().count('dpdk'):
+ env.update({'dpdk': systeminfo.get_version('dpdk')})
+
if result[ResultsConstants.DEPLOYMENT].count('v'):
env.update({'vnf': systeminfo.get_version(S.getValue('VNF')),
'guest_image': S.getValue('GUEST_IMAGE'),
diff --git a/tools/report/report_rst.jinja b/tools/report/report_rst.jinja
index b65980f3..4b5c9c37 100644
--- a/tools/report/report_rst.jinja
+++ b/tools/report/report_rst.jinja
@@ -17,7 +17,9 @@ Below is the environment that the test was performed in:
* vswitchperf: GIT tag: {{tests[0].env.vsperf['git_tag']}}
* Traffic Generator: {{tests[0].env.traffic_gen['name']}}, Version: {{tests[0].env.traffic_gen['version']}}, GIT tag: {{tests[0].env.traffic_gen['git_tag']}}
* vSwitch: {{tests[0].env.vswitch['name']}}, Version: {{tests[0].env.vswitch['version']}}, GIT tag: {{tests[0].env.vswitch['git_tag']}}
+{%- if 'dpdk' in tests[0].env %}
* DPDK Version: {{tests[0].env.dpdk['version']}}, GIT tag: {{tests[0].env.dpdk['git_tag']}}
+{%- endif %}
{%- if 'vnf' in tests[0].env %}
* VNF: {{tests[0].env.vnf['name']}}, Version: {{tests[0].env.vnf['version']}}, GIT tag: {{tests[0].env.vnf['git_tag']}}
* VM images:{% for guest_image in tests[0].env.guest_image %}