From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 78AC5A568 for ; Wed, 24 Jan 2018 10:19:06 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jan 2018 01:19:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,406,1511856000"; d="scan'208";a="25924087" Received: from unknown (HELO dpdk-fedora20.icx.intel.com) ([10.240.176.135]) by orsmga001.jf.intel.com with ESMTP; 24 Jan 2018 01:19:04 -0800 From: "zhao,meijuan" To: dts@dpdk.org Cc: "zhao,meijuan" Date: Wed, 24 Jan 2018 17:20:16 +0800 Message-Id: <1516785616-26805-1-git-send-email-meijuanx.zhao@intel.com> X-Mailer: git-send-email 1.9.3 Subject: [dts] [PATCH V1] tests/ddp_gtp: fix acquire vf queue fail 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: Wed, 24 Jan 2018 09:19:06 -0000 commit ee653bd8,queue-num-per-vf default value is defined in drivers/net/i40e/i40e_ethdev.c,name as RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF Signed-off-by: zhao,meijuan --- tests/TestSuite_ddp_gtp.py | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/tests/TestSuite_ddp_gtp.py b/tests/TestSuite_ddp_gtp.py index 1931b1a..d869580 100644 --- a/tests/TestSuite_ddp_gtp.py +++ b/tests/TestSuite_ddp_gtp.py @@ -26,10 +26,12 @@ class TestDdpGtp(TestCase): profile_file = 'dep/gtp.pkgo' profile_dst = "/tmp/" self.dut.session.copy_file_to(profile_file, profile_dst) - PF_Q_strip = 'CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF' - VF_Q_strip = 'CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF' - self.PF_QUEUE = self.search_queue_number(PF_Q_strip) - self.VF_QUEUE = self.search_queue_number(VF_Q_strip) + self.PF_Q_strip = 'CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF' + # commit ee653bd8, queue number of per vf default value is defined + # in drivers/net/i40e/i40e_ethdev.c, named as RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF + self.VF_Q_strip = 'RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF' + self.PF_QUEUE = self.search_queue_number(self.PF_Q_strip) + self.VF_QUEUE = self.search_queue_number(self.VF_Q_strip) def set_up(self): self.setup_vm_env() @@ -39,15 +41,22 @@ class TestDdpGtp(TestCase): """ Search max queue number from configuration. """ - out = self.dut.send_expect("cat config/common_base", "]# ", 10) - pattern = "(%s=)(\d*)" % Q_strip + if Q_strip is self.PF_Q_strip: + out = self.dut.send_expect("cat config/common_base", "]# ", 10) + pattern = "(%s=)(\d*)" % Q_strip + else : + out = self.dut.send_expect("cat drivers/net/i40e/i40e_ethdev.c", "]# ", 10) + pattern = "#define %s\s*(\d*)" % Q_strip s = re.compile(pattern) res = s.search(out) if res is None: print utils.RED('Search no queue number.') return None else: - queue = res.group(2) + if Q_strip is self.VF_Q_strip: + queue = res.group(1) + else : + queue = res.group(2) return int(queue) def bind_nic_driver(self, ports, driver=""): -- 1.9.3