[dts] [PATCH V1] framework/packet: remove sctp in required scapy module

[dts] [PATCH V1] framework/packet: remove sctp in required scapy module

[Haiyang Zhao]

sctp is in scapy.layers and is been imported by default,
so remove the importing sctp code.

Signed-off-by: Haiyang Zhao <haiyangx.zhao@intel.com>
---
 framework/packet.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/framework/packet.py b/framework/packet.py
index 2cd64d02..6d9bf246 100644
--- a/framework/packet.py
+++ b/framework/packet.py
@@ -52,8 +52,13 @@ from utils import convert_ip2int
 from utils import convert_int2ip
 
 scapy_modules_required = {'gtp': ['GTP_U_Header', 'GTPPDUSessionContainer'],
-                          'lldp': ['LLDPDU', 'LLDPDUManagementAddress'], 'Dot1BR': ['Dot1BR'], 'pfcp': ['PFCP'],
-                          'nsh': ['NSH'], 'igmp': ['IGMP'], 'mpls': ['MPLS'], 'sctp': ['SCTP', 'SCTPChunkData']}
+                          'lldp': ['LLDPDU', 'LLDPDUManagementAddress'],
+                          'Dot1BR': ['Dot1BR'],
+                          'pfcp': ['PFCP'],
+                          'nsh': ['NSH'],
+                          'igmp': ['IGMP'],
+                          'mpls': ['MPLS'],
+                          }
 local_modules = [m[:-3] for m in os.listdir(DEP_FOLDER + '/scapy_modules') if (m.endswith('.py') and not m.startswith('__'))]
 
 for m in scapy_modules_required:
@@ -63,14 +68,9 @@ for m in scapy_modules_required:
             for clazz in scapy_modules_required[m]:
                 locals().update({clazz: getattr(module, clazz)})
         else:
-            if m == 'sctp':
-                module = import_module(f'scapy.layers.{m}')
-                for clazz in scapy_modules_required[m]:
-                    locals().update({clazz: getattr(module, clazz)})
-            else:
-                module = import_module(f'scapy.contrib.{m}')
-                for clazz in scapy_modules_required[m]:
-                    locals().update({clazz: getattr(module, clazz)})
+            module = import_module(f'scapy.contrib.{m}')
+            for clazz in scapy_modules_required[m]:
+                locals().update({clazz: getattr(module, clazz)})
     except Exception as e:
         print(e)
 
-- 
2.17.1

Re: [dts] [PATCH V1] framework/packet: remove sctp in required scapy module

[Zhao, HaiyangX]

[-- Attachment #1: Type: text/plain, Size: 394 bytes --]

Tested-by:  Haiyang Zhao <haiyangx.zhao@intel.com>

Best Regards,
Zhao Haiyang

> -----Original Message-----
> From: Haiyang Zhao <haiyangx.zhao@intel.com>
> Sent: Wednesday, January 13, 2021 13:33
> To: dts@dpdk.org; Tu, Lijuan <lijuan.tu@intel.com>
> Cc: Zhao, HaiyangX <haiyangx.zhao@intel.com>
> Subject: [dts][PATCH V1] framework/packet: remove sctp in required scapy
> module

[-- Attachment #2: AdvancedRSSTest.log --]
[-- Type: application/octet-stream, Size: 149674 bytes --]

Re: [dts] [PATCH V1] framework/packet: remove sctp in required scapy module

[Tu, Lijuan]

> sctp is in scapy.layers and is been imported by default, so remove the
> importing sctp code.
> 
> Signed-off-by: Haiyang Zhao <haiyangx.zhao@intel.com>

Applied