From a3f5eb343644d1fad3dd82b5b7f275bf04913c28 Mon Sep 17 00:00:00 2001 From: Martin Klozik Date: Wed, 4 Apr 2018 06:08:20 +0100 Subject: 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 Reviewed-by: Al Morton Reviewed-by: Christian Trautman Reviewed-by: Sridhar Rao (cherry picked from commit ba486932a77eb7b1ae2f1fd6b3e231df925887e7) --- tools/pkt_gen/xena/json/xena_json.py | 3 --- 1 file changed, 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() -- cgit 1.2.3-korg