test suite reviews and discussions
 help / color / mirror / Atom feed
From: hanyingya <yingyax.han@intel.com>
To: dts@dpdk.org
Cc: hanyingya <yingyax.han@intel.com>
Subject: [dts] [PATCH V1]framework: compatible with different versions of scapy
Date: Thu, 16 Apr 2020 17:26:20 +0800	[thread overview]
Message-ID: <20200416092620.31365-1-yingyax.han@intel.com> (raw)

 some scapy version may have "L" suffix, and the other may not have.

Signed-off-by: hanyingya <yingyax.han@intel.com>
---
 framework/pktgen.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/framework/pktgen.py b/framework/pktgen.py
index 889e94a..d00cf3b 100644
--- a/framework/pktgen.py
+++ b/framework/pktgen.py
@@ -167,7 +167,10 @@ class PacketGeneratorHelper(object):
                 action = config.get('action') or 'default'
                 range = config.get('range') or 64
                 # ignore 'L' suffix
-                start_vlan = int(pcap_fields.get(layer_name)[:-1])
+                if 'L' in pcap_fields.get(layer_name):
+                    start_vlan = int(pcap_fields.get(layer_name)[:-1])
+                else:
+                    start_vlan = int(pcap_fields.get(layer_name))
                 end_vlan = start_vlan + range - 1
                 fields_config[layer_name][name] = {}
                 fields_config[layer_name][name]['start'] = start_vlan
@@ -212,4 +215,4 @@ def getPacketGenerator(tester, pktgen_type=PKTGEN_IXIA):
         return CLS(tester)
     else:
         msg = "not support <{0}> packet generator".format(pktgen_type)
-        raise Exception(msg)
\ No newline at end of file
+        raise Exception(msg)
-- 
2.17.1


             reply	other threads:[~2020-04-16  9:28 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-16  9:26 hanyingya [this message]
2020-04-20  5:11 ` Tu, Lijuan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200416092620.31365-1-yingyax.han@intel.com \
    --to=yingyax.han@intel.com \
    --cc=dts@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).