From: Christian Trautman <ctrautma@redhat.com>
Date: Fri, 19 Feb 2016 20:50:54 +0000 (-0500)
Subject: pktgen: docstring fix
X-Git-Tag: colorado.1.0~123
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F13%2F10313%2F2;p=vswitchperf.git

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>
---

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.
     """