From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0053.outbound.protection.outlook.com [104.47.40.53]) by dpdk.org (Postfix) with ESMTP id 983A94CC5 for ; Thu, 6 Apr 2017 19:52:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=DTVQHqvi+cQBmuiuezAoYZW+U6vDZ8wWe/G6zA0kybw=; b=KRQxh8WdurwCGY3ia97GlRLA7wIEs30Z2DBSAs9MVkj12Gwsj2jnEp2l+HFKz9BIAzKusLZkpJbuy6BJOQ2AMDNoP/dLyNCT73KY3R88iO5KdUJ07WRGPjmaZClRHRp9QpqOwg/WwTk/Lu069Us6ueX+VDc5KUYhq6SFp2kQyKw= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from angela-H81M-S1.semihalf.local (31.172.191.173) by DM2PR0701MB810.namprd07.prod.outlook.com (10.242.127.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10; Thu, 6 Apr 2017 17:52:03 +0000 From: Angela Czubak To: dts@dpdk.org Cc: Angela Czubak Date: Thu, 6 Apr 2017 19:51:24 +0200 Message-Id: <1491501092-14278-19-git-send-email-aczubak@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491501092-14278-1-git-send-email-aczubak@caviumnetworks.com> References: <1491501092-14278-1-git-send-email-aczubak@caviumnetworks.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [31.172.191.173] X-ClientProxiedBy: AM5PR0701CA0051.eurprd07.prod.outlook.com (10.169.145.141) To DM2PR0701MB810.namprd07.prod.outlook.com (10.242.127.24) X-MS-Office365-Filtering-Correlation-Id: 1f397ecb-437c-4f4c-3dc2-08d47d15a2ae X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131423075)(201703031133081); SRVR:DM2PR0701MB810; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB810; 3:uSk6ypEkins0F1tgwVxugV5gpDa4RkZep3Np4rt1ICm6ZrvzcSvZcVoXIna76SbaL8hFIA0VGBUeVz61e9ySFUYBcaSnioXvmElJFB/yOC0LmYwJYivLQmB2sjK5kVkZxPCq+bFlH4CamwmMWzfQQow9NOx0myX4KfhtVN1iYf4lcKa2kDOFp0YsgjAVCb/2h3IYk22WdYy9LZfWMva6ubKIPUnp6TW5AZ1B9a8eq5uCk6lj75ijhXAPVArl89mA9zDmivzUVJudf5EqNeF1TVLRx7N9BSmAU9EzQ/sGIAJY8pxKjNbhVcfrlrT+4VtHkpybUxNA/80zZrbPz/xNWA==; 25:ZgOZ0Qki3iqfR7Y7Ja54ATuHUIXT/m/pLTG56fD59EemOJMpvcVNGBtF8tl/PSm6qsiBCkGOdlDy+bdvyF6PZv6sUZ2nCyU+XLQyV05c36FKRxgE4Ekz/ToLwo3HNnl3tcnBl8Bg5PvocaXxdzyM3FwcUjWEZCYLT0xDFPeogbYos2p6Ufw1HOmZawgkhzhr7y93qNVLGgSqhGdnjhfQLmi+927fzKIlTht8fPl/run4ACDhouWLo7JWTdQ32QDiBZ+3eEOKPCff8L6idtJdF5J8Nnc8pNeWQKgxSNDZx6XjRnyE06x7Wfdac2rmHQa7RzlNDBVK0ecgtUd2iJGAENE03/kC3j/HDkc2WVHkLESMUAMfwX0UhDQSGBpA0R8kR5hsQXy1RTYBhYavRGz69kURAyBFchNLEaTwbYKxS7hcjPzPa1espjT1ietjKgzS88+8aLBOxGbWDzanIv71gA== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB810; 31:sP8yMxcjGUj9+5hRwTCj9ZJ3EwEBJ8shCRElXAqSHj9+OrVxANWTvc06h2VpDMR++mhEFGokbA7FvVQr03L11/Ee7v6yfwEPJ+qOC4BoRiXnwgoihy1JK98UIqYxmfG60Ht/hcv1Thu1uP3PK+zzm9vkjWrQQhSGFtyemeKF74brcsTKIMbgn+2KTeG2kvzSqlCqROecKH1Ln9OB9zajpVpWpLeljlLYuzpTZPYhsmfyvNH6fuPOBEJnaHLzgOt5; 20:SoYmLNOM8hD4QKdN7WHdrSqIF0FAEmRFqPGxHiO4lUnpT2dv6Bf1T2A4LYWE5+D5SlMaYS00GM55CwlRJSD4OFBR/HNNpgpDHMMrMdiv9HyIiF3FLZYBRcMc1qGT/TTcsbcpP7JI3auB2kSgBIGvZObaj1p+Dma7daBpG1bdOE4Z5ryEFL9KY+o/gW9OrYVQFPXmqOrJY/T5ylrF5rdE6inoG2bD3XfrIvZBu8VOZMQdY9ECAhzn1aMo9BkgCr4iYEzQ2thSA2Fmo0lCpMzYZT1slL5N+jVCGd25c20G3x9d+18KKS5dZEnCnwno4vlSabUS+5349cYZ8bLV8m18GqHpy4w3ekn+q+k21sEOiw8K4Quv8RSfMkxlbAyN01H+7ALmsvguFLyNA31Ui/sWyBHr+z69D9KdT5FpNdVDlwWuexDvZjoe8TrJW8dkGLCM9A9obg+P9dx/15C77Aq5CQob7vzJyw1Eu58tMpcV7pz126OFBCMwu8vvzUmu45WGlG/MWkXjO9NDL07B9dN7jKyu8YoqJ3CRu42ToAuKdz7JyRa9MAogE1RQ1btsvVui0ZgRQqb/VvtOHqfEsjTRmu9DyGl8SPgip6MT62cLyls= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(10201501046)(3002001)(6041248)(20161123555025)(20161123560025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(20161123562025)(6072148); SRVR:DM2PR0701MB810; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0701MB810; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB810; 4:DkTxW6yvOwAb2nrtnQLXbVgIjTW6NVhHWH+/CoPUnzQihAHHj6U8PR6yFgPdo6ChAQeRCvnHxTecdYyriXsxq5qsZY8/VeVefVN283EBeTLq81XSB1GAYRjV+9F3WrQ2sBX0jGOq/3fk3S/7EiqWaDNCAmADBvn3mYsAUPNqAwOgKvmg5HzAJkW0gzyX7EhQD7qruCjVzkdwGTCBNiH3HB2v4PX1NWM/ZLJLLk/ZtAuczFCmSnoB6F+u9vkidt5dR1NLbWPRi+Umo7y/jQ4DzzgodmUhARxL6es+favX+smsx+GnFuXlwFszduwUrX5UJtDXDGuk66qLClChUYGG+P1CKOmUovSXcwKGks+t1Dbr9ZzD0jRZScHvxpzHQhctb51sc2Bk6ixXBko8gv/9PLZhiCAcq7nxzhkt5JAwi6f9Oh5+BFdKm1MQ6zfqPdKLlr+sfNTQEAF5vxe6TAi8hMpwMlSxK5biR5gPD1mwWzJX7PEZP7xAQTkJfXUPynQ8cd3enuf1AMll2FBnqQixRqbKrJ89zrRpYzDOl+ne7MvfTovX8TFVH1mKCsbL8/hYkfGz+v3hoTqZk16ICoa4+5lC5dVM8XpqJWdPjkkX4KgIaJYiVTF9+CvYEtiavL3zOUB4ZvxFB9fbJydM/xBySuPvATxrmxvlLpfq8RGcCqO+ZOhuq72przaDujCWLx8+ X-Forefront-PRVS: 02698DF457 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39830400002)(39450400003)(39400400002)(39410400002)(3846002)(50226002)(6116002)(47776003)(33646002)(6506006)(189998001)(6486002)(48376002)(50466002)(36756003)(66066001)(8676002)(5003940100001)(2361001)(42882006)(110136004)(107886003)(38730400002)(76176999)(25786009)(2351001)(6666003)(81166006)(42186005)(50986999)(6916009)(6512007)(7736002)(53936002)(4326008)(5660300001)(305945005)(2950100002)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0701MB810; H:angela-H81M-S1.semihalf.local; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0701MB810; 23:8xIe4wLivxLQ0Q48qEvMoMdKmPJ1Zg4GziwztNin?= =?us-ascii?Q?ArOuJjdkuRfpWbqzL2tf4BEkh1OUUDOBOtZMnKut6YTgH8twcNYzQ7OwEpqs?= =?us-ascii?Q?hcwqrU9OJj3utvKvYbghWjsoT+XXU3MsKXvyB4EZhgV88pykvIWxSiNJ7KKv?= =?us-ascii?Q?m+iLrJrptm3Ir6uK5ezU7ICP7dxG7r6AyPuPEywxPUS7SHcz/xawXelgMCTI?= =?us-ascii?Q?iTPRhUk9AdjczcPCEVtyLezRBp+TMu/euO/+yXWP2Vba8TqVcDxe8N8/mZpY?= =?us-ascii?Q?/YMBxZOdaJngzo3b8+j9Xhw50jtow2JzAnInCcGsVTsM9vuKlHzuwg1BBnfJ?= =?us-ascii?Q?585n3J4u9P72hXCfRGdWnlzu3XmECsiMc2i/44Y76883hZEliXWf7FRZw8HK?= =?us-ascii?Q?6oUgBZkH5S4POfKu+E9NN1/bMXe0i5rgJu5dWCpawRugQgoAuFqJbgYpnYx6?= =?us-ascii?Q?WyPNvEqseKVC3GgcR6WjkyDpJxABjt7+1gr7XFja8gJSd/BfzaYiQXrsdqzc?= =?us-ascii?Q?K8KrFUqaEQTMjoJhJtNpYj4UGGrOEymAr2lP/W/3WOtv9r4Ki51xPOZ2VFWA?= =?us-ascii?Q?8NXOSxpnRPEwPWBxuOk7imck2T/FuIeQSS3fcNzuv+hS1KXj1M424IGydWfS?= =?us-ascii?Q?qbH2AJbRDhZjftDMA+DfRGkW2V23pYhKYwNyDfhBNWL2iukiR4fA8nGZR/aj?= =?us-ascii?Q?WtwZAppKntWL2vJZ76uCjjijGgoIz8YYfuL1WutttMljwsyLb8gyNMonWvgb?= =?us-ascii?Q?y3oD95I/e+kk+sW6bIhs2Pqq7K2pSaNduuiSfCWLLQPjJgRhArZ+gP8BJA2H?= =?us-ascii?Q?WX/1RuJuWwgu8keR1a/OsUCIIO9W6KgQtplm/8VdB2V4F3fuRrcAbjW2V7TM?= =?us-ascii?Q?0YuPVwNwKGd4TYccFU3GP61aj7qN9Q/tNHBc5wGagEVU6Bp7WHqCelpDj6UW?= =?us-ascii?Q?ZuZafKqYcHfb+KZj4T6A//fhvL47xNhWYdJxe9ftn9yEx+FYtl7JkPtBSdt8?= =?us-ascii?Q?LPcf/FyvK4SYmXu/jRB3jPL0SH1Dsq02ixks02QsbBethA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB810; 6:SODJ143E1eiw45Ln9HZ0wY2m/EcElmgMjwRP/rypAp9SlV4SDqrQGaW7bxewnhlhUKvvNXY2Fzvf/2pr3hxw788qo0Vjm6fmuECEwAYe/qJQtNU3EUQ4DLLILEDFzBZq5pGTLkKTQSPyG8uohPDxoiZtiW94UURKTsxzb4uoxRurAT8qu2hp5ZzphbALFlpuHsR/ufdqF5yQyrJKd9ZkX/sxFG+Pfbt1OgIgtp6/0Sw+KX91zuKgGJSrFkH4cBQPotqtuzD62uGZxpshtnj102lqTEvBSjmu/TgzrxdBU/suo6PrvX7Te40ukw8en6cB8cimn5Da6QdUVHHchf7S/oy9oLptgKPpT5w41RRqAgejTsQzqOWascGrhXh/hDf60nPCRmVgr/VH+ozkGlJIfw==; 5:ijtdWwXk183TCxCgPKWwThR/Z5ExzL4uUUNKuYnzoXvg3EfFQAqQviGdFsWaeGlRDSDYDCHX8YzoZkqo+8M0FtY6VB3c7seQqvrtleK2CduVjWCkOwY0q0TlZAtEboaEvyHeazbYlCrp9FTR7dG64A==; 24:t5aUzBRJwl7OTcNDbgpB2lTmSnzw9Vz2LginE3PtkCPr2So50kPoWIuhsj5w/LIMmo5r6CaCeV0YAZR4M/sixITbktg99pSnL/FcYZp3dCs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0701MB810; 7:li8MbuA3aEwpVGhgm2VFpgSpFJvlELcVyG6lCm+7zsUuhtVSL67s6ppCGDziQ5p8QcAS+xZWKsTRmns0NREwgsZ+86Eq4zVawEgC4ngqcm2NsdUs64pMXk7iZwnlscg8Iifoo/AfLTpSotg6l3rwkZSj+6E8Q95nrAqZZVAgoFRb5VHyiQIE1x6pSFBH5gxZcXNpWXo9PfXALmK++d7aqDtdpBpBWD+W0u7gN7DciinWESkvGlWzQfW27AyZUYzdSrF4yyKpPw+Jr3QOT0V+OjOnLik1LNcCdIUI+cbUnqccR39odzTHbY7C+AFHficWjCPPKC5l/l4pIdXBVCZy6g== X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2017 17:52:03.7381 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0701MB810 Subject: [dts] [PATCH 18/26] tests: pmdpcap - modifying the right config file + importing utils after scapy X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Apr 2017 17:52:06 -0000 This test used to modify config/common_linuxapp or config/common_bsdapp to compile DPDK with PCAP, however, this config may lie as well in config/common_base. If the PCAP variable is not found in OS specific files, then it is assumed that config/common_base should be modified. Scapy may contain utils itself, therefore importing dts utils is moved after importing from scapy (so as to override utils). Signed-off-by: Angela Czubak --- tests/TestSuite_pmdpcap.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/TestSuite_pmdpcap.py b/tests/TestSuite_pmdpcap.py index 0a79e96..a51eb31 100644 --- a/tests/TestSuite_pmdpcap.py +++ b/tests/TestSuite_pmdpcap.py @@ -32,10 +32,10 @@ ''' ''' from test_case import TestCase -import utils from time import sleep from scapy.all import * +import utils # @@ -73,8 +73,11 @@ class TestPmdPcap(TestCase): else: raise Exception( "Unknow os type, please check to make sure pcap can work in OS [ %s ]" % os_type) - - return config_head + config_tail + out = self.dut.send_command("cat config/%s" % (config_head + config_tail)) + if "CONFIG_RTE_LIBRTE_PMD_PCAP" in out: + return config_head + config_tail + else: + return config_head + "base" def create_pcap_file(self, filename, number_of_packets): flow = [] -- 2.7.4