From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 63671A0C4E; Tue, 2 Nov 2021 09:12:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A2C774113B; Tue, 2 Nov 2021 09:12:32 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 893AE4069F for ; Tue, 2 Nov 2021 09:12:30 +0100 (CET) X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="218402732" X-IronPort-AV: E=Sophos;i="5.87,202,1631602800"; d="scan'208";a="218402732" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2021 01:12:27 -0700 X-IronPort-AV: E=Sophos;i="5.87,202,1631602800"; d="scan'208";a="489003015" Received: from unknown (HELO dpdk-zhaohy-t.sh.intel.com) ([10.240.183.68]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Nov 2021 01:12:23 -0700 From: Jiale Song To: dts@dpdk.org Cc: Jiale Song Date: Tue, 2 Nov 2021 16:12:00 +0800 Message-Id: <1635840720-90878-10-git-send-email-songx.jiale@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1635840720-90878-1-git-send-email-songx.jiale@intel.com> References: <1635840720-90878-1-git-send-email-songx.jiale@intel.com> Subject: [dts] [PATCH V2 10/10] tests/vf_vlan: update case code for driver change X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" the iavf vlan priv-flags of the kernel drive of columbiaville has changed from vf-vlan-prune-disable to vf-vlan-pruning in ice 1.7.2_3_g03d5f45f,and is closed by default,so the affected case needs to modify the code Signed-off-by: Jiale Song --- tests/TestSuite_vf_vlan.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/tests/TestSuite_vf_vlan.py b/tests/TestSuite_vf_vlan.py index 127eca39..db6c2dd6 100644 --- a/tests/TestSuite_vf_vlan.py +++ b/tests/TestSuite_vf_vlan.py @@ -68,6 +68,13 @@ class TestVfVlan(TestCase): # get driver version self.driver_version = self.nic_obj.driver_version + # bind to default driver + self.bind_nic_driver(self.dut_ports[:2], driver="") + self.host_intf0 = self.dut.ports_info[self.dut_ports[0]]['intf'] + # get priv-flags default stats + self.flag = 'vf-vlan-pruning' + self.default_stats = self.dut.get_priv_flags_state(self.host_intf0, self.flag) + def set_up(self): self.setup_vm_env() @@ -103,14 +110,12 @@ class TestVfVlan(TestCase): if self.env_done: return - # bind to default driver - self.bind_nic_driver(self.dut_ports[:2], driver="") - self.used_dut_port_0 = self.dut_ports[0] self.host_intf0 = self.dut.ports_info[self.used_dut_port_0]['intf'] tester_port = self.tester.get_local_port(self.used_dut_port_0) self.tester_intf0 = self.tester.get_interface(tester_port) - + if self.nic.startswith('columbiaville') and self.default_stats: + self.dut.send_expect("ethtool --set-priv-flags %s %s on" % (self.host_intf0, self.flag), "# ") self.dut.generate_sriov_vfs_by_port( self.used_dut_port_0, 1, driver=driver) self.sriov_vfs_port_0 = self.dut.ports_info[ @@ -123,6 +128,8 @@ class TestVfVlan(TestCase): self.used_dut_port_1 = self.dut_ports[1] self.host_intf1 = self.dut.ports_info[self.used_dut_port_1]['intf'] + if self.nic.startswith('columbiaville') and self.default_stats: + self.dut.send_expect("ethtool --set-priv-flags %s %s on" % (self.host_intf1, self.flag), "# ") self.dut.generate_sriov_vfs_by_port( self.used_dut_port_1, 1, driver=driver) self.sriov_vfs_port_1 = self.dut.ports_info[ @@ -181,7 +188,7 @@ class TestVfVlan(TestCase): port = self.dut.ports_info[self.used_dut_port_1]['port'] self.used_dut_port_1 = None - self.bind_nic_driver(self.dut_ports[:2], driver='default') + self.bind_nic_driver(self.dut_ports[:2], driver="") self.env_done = False @@ -271,7 +278,7 @@ class TestVfVlan(TestCase): self.verify("vlan %d" % random_vlan not in out, "Failed to remove pvid on VF0") # send packet with vlan - self.vm0_testpmd.execute_cmd("port reset 0") + self.vm0_testpmd.execute_cmd("port reset 0", 'testpmd> ', 120) self.vm0_testpmd.execute_cmd("port start all") self.vm0_testpmd.execute_cmd("start") @@ -449,4 +456,5 @@ class TestVfVlan(TestCase): def tear_down_all(self): self.destroy_vm_env() - pass + if self.nic.startswith('columbiaville') and self.default_stats: + self.dut.send_expect("ethtool --set-priv-flags %s %s %s" % (self.host_intf0, self.flag, self.default_stats), "# ") -- 2.17.1