summaryrefslogtreecommitdiffstats
path: root/tools/pkt_gen/trafficgen/trafficgenhelper.py
diff options
context:
space:
mode:
authorChristian Trautman <ctrautma@redhat.com>2016-02-19 15:50:54 -0500
committerMaryam Tahhan <maryam.tahhan@intel.com>2016-02-21 15:28:31 +0000
commit888805eb639705b420c430727c2443189fcf8ab1 (patch)
tree4c74b657c15cec85480e7bd5b706de6b35087254 /tools/pkt_gen/trafficgen/trafficgenhelper.py
parent2d78f57d4433b5553e2df76bbaca28d4ceabd6c9 (diff)
pktgen: docstring fix
Fixed docstring to correctly reflect python output from using merge_spec function. JIRA: VSPERF-210 Change-Id: Ie3bf2a3d148aa9823bafafe8c61c4c94f00ccc87 Signed-off-by: Christian Trautman <ctrautma@redhat.com> Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com>
Diffstat (limited to 'tools/pkt_gen/trafficgen/trafficgenhelper.py')
-rw-r--r--tools/pkt_gen/trafficgen/trafficgenhelper.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/pkt_gen/trafficgen/trafficgenhelper.py b/tools/pkt_gen/trafficgen/trafficgenhelper.py
index f5ac539d..97cf6377 100644
--- a/tools/pkt_gen/trafficgen/trafficgenhelper.py
+++ b/tools/pkt_gen/trafficgen/trafficgenhelper.py
@@ -63,7 +63,7 @@ def merge_spec(orig, new):
>>> old = {'foo': 1, 'bar': {'foo': 2, 'bar': 3}}
>>> new = {'foo': 6, 'bar': {'foo': 7}}
>>> merge_spec(old, new)
- {'foo': 3, 'bar': {'foo': 7, 'bar': 3}}
+ {'foo': 6, 'bar': {'foo': 7, 'bar': 3}}
You'll notice that ``bar.bar`` is not removed. This is the desired result.
"""