Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/83632/?format=api
{ "id": 83632, "url": "http://patchwork.dpdk.org/api/patches/83632/?format=api", "web_url": "http://patchwork.dpdk.org/project/dts/patch/20201104025209.8423-1-box.c.chen@intel.com/", "project": { "id": 3, "url": "http://patchwork.dpdk.org/api/projects/3/?format=api", "name": "DTS", "link_name": "dts", "list_id": "dts.dpdk.org", "list_email": "dts@dpdk.org", "web_url": "", "scm_url": "git://dpdk.org/tools/dts", "webscm_url": "http://git.dpdk.org/tools/dts/", "list_archive_url": "https://inbox.dpdk.org/dts", "list_archive_url_format": "https://inbox.dpdk.org/dts/{}", "commit_url_format": "" }, "msgid": "<20201104025209.8423-1-box.c.chen@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dts/20201104025209.8423-1-box.c.chen@intel.com", "date": "2020-11-04T02:52:09", "name": "[V1] framework: fix Trex mode not working", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "72ad0fe1397310f89e264a7897cf82501acd15fd", "submitter": { "id": 1819, "url": "http://patchwork.dpdk.org/api/people/1819/?format=api", "name": "Chen, BoX C", "email": "box.c.chen@intel.com" }, "delegate": null, "mbox": "http://patchwork.dpdk.org/project/dts/patch/20201104025209.8423-1-box.c.chen@intel.com/mbox/", "series": [ { "id": 13635, "url": "http://patchwork.dpdk.org/api/series/13635/?format=api", "web_url": "http://patchwork.dpdk.org/project/dts/list/?series=13635", "date": "2020-11-04T02:52:09", "name": "[V1] framework: fix Trex mode not working", "version": 1, "mbox": "http://patchwork.dpdk.org/series/13635/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/83632/comments/", "check": "pending", "checks": "http://patchwork.dpdk.org/api/patches/83632/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dts-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id CECF0A04E7;\n\tWed, 4 Nov 2020 03:54:43 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id D9BBCBE63;\n\tWed, 4 Nov 2020 03:54:41 +0100 (CET)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n by dpdk.org (Postfix) with ESMTP id 4A8F2BE5F\n for <dts@dpdk.org>; Wed, 4 Nov 2020 03:54:39 +0100 (CET)", "from orsmga004.jf.intel.com ([10.7.209.38])\n by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 03 Nov 2020 18:54:37 -0800", "from unknown (HELO cb-dts.sh.intel.com) ([10.240.183.58])\n by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 03 Nov 2020 18:54:35 -0800" ], "IronPort-SDR": [ "\n LgfOlXcxE+uzGqKFwj9uOaLgHjaHuk06Lft+w54s3Ioi0jfft/5qO01O792yZRoJfXcK6pz7m+\n qP7zsC6VNH8A==", "\n I/k/PRH93YFjNmtHc2Vd2v24FnYTSy3zfZl6nssSZPNldkCZ79ys1uMwMON+W0rJG8RWXd6ySS\n FzuymVVlRXDQ==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9794\"; a=\"253868858\"", "E=Sophos;i=\"5.77,449,1596524400\"; d=\"scan'208\";a=\"253868858\"", "E=Sophos;i=\"5.77,449,1596524400\"; d=\"scan'208\";a=\"471038226\"" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "From": "\"Chen, BoX C\" <box.c.chen@intel.com>", "To": "dts@dpdk.org", "Cc": "\"Chen, BoX C\" <box.c.chen@intel.com>, Chen@dpdk.org", "Date": "Wed, 4 Nov 2020 10:52:09 +0800", "Message-Id": "<20201104025209.8423-1-box.c.chen@intel.com>", "X-Mailer": "git-send-email 2.17.1", "Subject": "[dts] [PATCH V1] framework: fix Trex mode not working", "X-BeenThere": "dts@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "test suite reviews and discussions <dts.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dts>,\n <mailto:dts-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dts/>", "List-Post": "<mailto:dts@dpdk.org>", "List-Help": "<mailto:dts-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dts>,\n <mailto:dts-request@dpdk.org?subject=subscribe>", "Errors-To": "dts-bounces@dpdk.org", "Sender": "\"dts\" <dts-bounces@dpdk.org>" }, "content": "DTS requires Trex compatible scapy, modify package loading mode and scapy version verification rules\n\nSigned-off-by: Chen, BoX C <box.c.chen@intel.com>\n---\n framework/packet.py | 23 +++++++++++++----------\n framework/tester.py | 12 ++++--------\n 2 files changed, 17 insertions(+), 18 deletions(-)", "diff": "diff --git a/framework/packet.py b/framework/packet.py\nindex dbc0058..7d974db 100644\n--- a/framework/packet.py\n+++ b/framework/packet.py\n@@ -57,19 +57,22 @@ scapy_modules_required = {'gtp': ['GTP_U_Header', 'GTPPDUSessionContainer'],\n local_modules = [m[:-3] for m in os.listdir(DEP_FOLDER + '/scapy_modules') if (m.endswith('.py') and not m.startswith('__'))]\n \n for m in scapy_modules_required:\n- if m in local_modules:\n- module = import_module(m)\n- for clazz in scapy_modules_required[m]:\n- locals().update({clazz: getattr(module, clazz)})\n- else:\n- if m == 'sctp':\n- module = import_module(f'scapy.layers.{m}')\n+ try:\n+ if m in local_modules:\n+ module = import_module(m)\n for clazz in scapy_modules_required[m]:\n locals().update({clazz: getattr(module, clazz)})\n else:\n- module = import_module(f'scapy.contrib.{m}')\n- for clazz in scapy_modules_required[m]:\n- locals().update({clazz: getattr(module, clazz)})\n+ if m == 'sctp':\n+ module = import_module(f'scapy.layers.{m}')\n+ for clazz in scapy_modules_required[m]:\n+ locals().update({clazz: getattr(module, clazz)})\n+ else:\n+ module = import_module(f'scapy.contrib.{m}')\n+ for clazz in scapy_modules_required[m]:\n+ locals().update({clazz: getattr(module, clazz)})\n+ except Exception as e:\n+ print(e)\n \n def get_scapy_module_impcmd():\n cmd_li = list()\ndiff --git a/framework/tester.py b/framework/tester.py\nindex df432d5..b2cbdb0 100644\n--- a/framework/tester.py\n+++ b/framework/tester.py\n@@ -111,21 +111,17 @@ class Tester(Crb):\n \n def check_scapy_version(self):\n require_version = '2.4.4'\n- self.scapy_session.get_session_before(timeout = 1)\n+ self.scapy_session.get_session_before(timeout=1)\n self.scapy_session.send_expect('conf.version', '\\'')\n- out = self.scapy_session.get_session_before(timeout = 1)\n+ out = self.scapy_session.get_session_before(timeout=1)\n cur_version = out[:out.find('\\'')]\n out = self.session.send_expect('grep scapy requirements.txt', '# ')\n value = re.search('scapy\\s*==\\s*(\\S*)', out)\n if value is not None:\n require_version = value.group(1)\n- cur_version = cur_version.split('.')\n- require_version = require_version.split('.')\n- for i in range(len(require_version)):\n- if int(cur_version[i]) < int(require_version[i]):\n- self.logger.warning('The scapy vesrion not meet the requirement on tester,' +\n+ if cur_version != require_version:\n+ self.logger.warning('The scapy vesrion not meet the requirement on tester,' +\n 'please update your scapy, otherwise maybe some suite will failed')\n- break\n \n def init_ext_gen(self):\n \"\"\"\n", "prefixes": [ "V1" ] }