scapy: Fix scapy import in Xena 73/54873/1
authorMartin Klozik <martinx.klozik@intel.com>
Wed, 4 Apr 2018 05:08:20 +0000 (06:08 +0100)
committerMartin Klozik <martinx.klozik@intel.com>
Wed, 4 Apr 2018 05:08:20 +0000 (06:08 +0100)
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>
tools/pkt_gen/xena/json/xena_json.py

index 90b61d8..df2aa55 100644 (file)
@@ -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()