[V2] tests/link_status_interrupt: close nic link-down-on-close off
Checks
Commit Message
some nics do not support this detection function, delete the check and directly close
nic link-down-on-close
Signed-off-by: Jiale Song <songx.jiale@intel.com>
---
tests/TestSuite_link_status_interrupt.py | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
Comments
> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Jiale Song
> Sent: 2021年10月11日 11:42
> To: dts@dpdk.org
> Cc: Jiale, SongX <songx.jiale@intel.com>
> Subject: [dts] [PATCH V2] tests/link_status_interrupt: close nic link-down-on-
> close off
>
> some nics do not support this detection function, delete the check and directly
> close nic link-down-on-close
>
The check have deal with the situation that some nics might be not support it. So I don't think there is any need for your patch.
> Signed-off-by: Jiale Song <songx.jiale@intel.com>
> ---
> tests/TestSuite_link_status_interrupt.py | 19 ++-----------------
> 1 file changed, 2 insertions(+), 17 deletions(-)
>
> diff --git a/tests/TestSuite_link_status_interrupt.py
> b/tests/TestSuite_link_status_interrupt.py
> index 5590d94..861ca50 100755
> --- a/tests/TestSuite_link_status_interrupt.py
> +++ b/tests/TestSuite_link_status_interrupt.py
> @@ -70,22 +70,6 @@ class TestLinkStatusInterrupt(TestCase):
> self.basic_intr_mode = ["msix", "legacy"]
> if self.drivername == "vfio-pci":
> self.basic_intr_mode.append("msi")
> - self.intfs = [self.tester.get_interface(self.tester.get_local_port(i)) for i in
> self.dut_ports]
> - # check link-down-on-close flag
> - self.flag = "link-down-on-close"
> - for intf in self.intfs:
> - check_flag = "ethtool --show-priv-flags %s" % intf
> - set_flag = "ethtool --set-priv-flags %s %s on" % (intf, self.flag)
> - out = self.tester.send_expect(check_flag, "#")
> - p = re.compile('%s\s+:\s+(\w+)' % self.flag)
> - res = re.search(p, out).group(1)
> - if res == "off":
> - self.tester.send_expect(set_flag, "#")
> - time.sleep(0.5)
> - out = self.tester.send_expect(check_flag, "#")
> - self.verify(re.search(p, out).group(1) == "on", "set %s %s on failed" %
> (intf, self.flag))
> - elif not res:
> - self.logger.info("NIC %s might not support this case" % intf)
>
> def set_link_status_and_verify(self, dutPort, status):
> """
> @@ -209,6 +193,7 @@ class TestLinkStatusInterrupt(TestCase):
> """
> Run after each test suite.
> """
> + self.intfs =
> + [self.tester.get_interface(self.tester.get_local_port(i)) for i in
> + self.dut_ports]
> if self.dut.get_os_type() != 'freebsd':
> for intf in self.intfs:
> - self.tester.send_expect("ethtool --set-priv-flags %s %s off" % (intf,
> self.flag), "#", 10)
> + self.tester.send_expect("ethtool --set-priv-flags %s
> + link-down-on-close off" % intf, "# ")
> --
> 2.17.1
> -----Original Message-----
> From: Jiale, SongX <songx.jiale@intel.com>
> Sent: 2021年10月25日 13:34
> To: Tu, Lijuan <lijuan.tu@intel.com>; dts@dpdk.org
> Subject: RE: [dts] [PATCH V2] tests/link_status_interrupt: close nic link-down-on-
> close off
>
> some network cards do not have link-down-on-close, such as niantic, etc., but
> using verify() to make assertions in the code will cause case failed
I saw it is checked as bellowing:
> > - elif not res:
> > - self.logger.info("NIC %s might not support this case" %
> intf)"
>
> Regards,
> Song Jiale
>
> > -----Original Message-----
> > From: Tu, Lijuan <lijuan.tu@intel.com>
> > Sent: Monday, October 25, 2021 11:52 AM
> > To: Jiale, SongX <songx.jiale@intel.com>; dts@dpdk.org
> > Cc: Jiale, SongX <songx.jiale@intel.com>
> > Subject: RE: [dts] [PATCH V2] tests/link_status_interrupt: close nic
> > link-down-on-close off
> >
> >
> >
> > > -----Original Message-----
> > > From: dts <dts-bounces@dpdk.org> On Behalf Of Jiale Song
> > > Sent: 2021年10月11日 11:42
> > > To: dts@dpdk.org
> > > Cc: Jiale, SongX <songx.jiale@intel.com>
> > > Subject: [dts] [PATCH V2] tests/link_status_interrupt: close nic
> > > link-down-on- close off
> > >
> > > some nics do not support this detection function, delete the check
> > > and directly close nic link-down-on-close
> > >
> >
> > The check have deal with the situation that some nics might be not support it.
> > So I don't think there is any need for your patch.
> >
> > > Signed-off-by: Jiale Song <songx.jiale@intel.com>
> > > ---
> > > tests/TestSuite_link_status_interrupt.py | 19 ++-----------------
> > > 1 file changed, 2 insertions(+), 17 deletions(-)
> > >
> > > diff --git a/tests/TestSuite_link_status_interrupt.py
> > > b/tests/TestSuite_link_status_interrupt.py
> > > index 5590d94..861ca50 100755
> > > --- a/tests/TestSuite_link_status_interrupt.py
> > > +++ b/tests/TestSuite_link_status_interrupt.py
> > > @@ -70,22 +70,6 @@ class TestLinkStatusInterrupt(TestCase):
> > > self.basic_intr_mode = ["msix", "legacy"]
> > > if self.drivername == "vfio-pci":
> > > self.basic_intr_mode.append("msi")
> > > - self.intfs = [self.tester.get_interface(self.tester.get_local_port(i)) for i
> > in
> > > self.dut_ports]
> > > - # check link-down-on-close flag
> > > - self.flag = "link-down-on-close"
> > > - for intf in self.intfs:
> > > - check_flag = "ethtool --show-priv-flags %s" % intf
> > > - set_flag = "ethtool --set-priv-flags %s %s on" % (intf, self.flag)
> > > - out = self.tester.send_expect(check_flag, "#")
> > > - p = re.compile('%s\s+:\s+(\w+)' % self.flag)
> > > - res = re.search(p, out).group(1)
> > > - if res == "off":
> > > - self.tester.send_expect(set_flag, "#")
> > > - time.sleep(0.5)
> > > - out = self.tester.send_expect(check_flag, "#")
> > > - self.verify(re.search(p, out).group(1) == "on", "set %s %s
> > on failed" %
> > > (intf, self.flag))
> > > - elif not res:
> > > - self.logger.info("NIC %s might not support this case" %
> > intf)
> > >
> > > def set_link_status_and_verify(self, dutPort, status):
> > > """
> > > @@ -209,6 +193,7 @@ class TestLinkStatusInterrupt(TestCase):
> > > """
> > > Run after each test suite.
> > > """
> > > + self.intfs =
> > > + [self.tester.get_interface(self.tester.get_local_port(i)) for i in
> > > + self.dut_ports]
> > > if self.dut.get_os_type() != 'freebsd':
> > > for intf in self.intfs:
> > > - self.tester.send_expect("ethtool --set-priv-flags %s %s
> > off" % (intf,
> > > self.flag), "#", 10)
> > > + self.tester.send_expect("ethtool --set-priv-flags
> > > + %s link-down-on-close off" % intf, "# ")
> > > --
> > > 2.17.1
> >
>
@@ -70,22 +70,6 @@ class TestLinkStatusInterrupt(TestCase):
self.basic_intr_mode = ["msix", "legacy"]
if self.drivername == "vfio-pci":
self.basic_intr_mode.append("msi")
- self.intfs = [self.tester.get_interface(self.tester.get_local_port(i)) for i in self.dut_ports]
- # check link-down-on-close flag
- self.flag = "link-down-on-close"
- for intf in self.intfs:
- check_flag = "ethtool --show-priv-flags %s" % intf
- set_flag = "ethtool --set-priv-flags %s %s on" % (intf, self.flag)
- out = self.tester.send_expect(check_flag, "#")
- p = re.compile('%s\s+:\s+(\w+)' % self.flag)
- res = re.search(p, out).group(1)
- if res == "off":
- self.tester.send_expect(set_flag, "#")
- time.sleep(0.5)
- out = self.tester.send_expect(check_flag, "#")
- self.verify(re.search(p, out).group(1) == "on", "set %s %s on failed" % (intf, self.flag))
- elif not res:
- self.logger.info("NIC %s might not support this case" % intf)
def set_link_status_and_verify(self, dutPort, status):
"""
@@ -209,6 +193,7 @@ class TestLinkStatusInterrupt(TestCase):
"""
Run after each test suite.
"""
+ self.intfs = [self.tester.get_interface(self.tester.get_local_port(i)) for i in self.dut_ports]
if self.dut.get_os_type() != 'freebsd':
for intf in self.intfs:
- self.tester.send_expect("ethtool --set-priv-flags %s %s off" % (intf, self.flag), "#", 10)
+ self.tester.send_expect("ethtool --set-priv-flags %s link-down-on-close off" % intf, "# ")