diff options
| author |   Martin Klozik <martinx.klozik@intel.com> | 2018-04-04 06:08:20 +0100 |
|---|---|---|
| committer | Martin Klozik <martinx.klozik@intel.com> | 2018-04-04 06:10:37 +0000 |
| commit | a3f5eb343644d1fad3dd82b5b7f275bf04913c28 (patch) | |
| tree | d689c41bcacf08199151eb9fd7041d31035cf89b | |
| parent | a87a7696e58082b10fadef24176d53ebc67f3bd5 (diff) | |
scapy: Fix scapy import in Xena
Remove unnecessary scapy import, which is causing pylint error
with recent pylint version.
JIRA: VSPERF-566
Change-Id: I082de0e93242486248beaed6822a8d0f30fff7e5
Signed-off-by: Martin Klozik <martinx.klozik@intel.com>
Reviewed-by: Al Morton <acmorton@att.com>
Reviewed-by: Christian Trautman <ctrautma@redhat.com>
Reviewed-by: Sridhar Rao <sridhar.rao@spirent.com>
(cherry picked from commit ba486932a77eb7b1ae2f1fd6b3e231df925887e7)
| -rw-r--r-- | tools/pkt_gen/xena/json/xena_json.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/pkt_gen/xena/json/xena_json.py b/tools/pkt_gen/xena/json/xena_json.py index 90b61d8c..df2aa55f 100644 --- a/tools/pkt_gen/xena/json/xena_json.py +++ b/tools/pkt_gen/xena/json/xena_json.py @@ -49,9 +49,6 @@ class XenaJSON(object): two module ports with each port having its own stream config profile. :return: XenaJSON object """ - # import can't be performed at module level, because it conflicts with import - # of customized scapy version by T-Rex - import scapy.layers.inet as inet self.json_data = json_utilities.read_json_file(json_path) self.packet_data = OrderedDict() |