[dts] [patch V1 2/2] update shutdown_api and jumboframes check tx-packets code

[Xu, HuilongX]

Yes, I will send V2 patch for check tx-bytes.
Thanks  a lot

> -----Original Message-----
> From: Liu, Yong
> Sent: Thursday, January 12, 2017 9:20 AM
> To: Xu, HuilongX; dts at dpdk.org
> Cc: Xu, HuilongX
> Subject: RE: [dts] [patch V1 2/2] update shutdown_api and jumboframes
> check tx-packets code
> 
> Huilong,
> There're lots of function may affected if we can't avoid LLDP packets sending
> out from dpdk drive Fortville port.
> We need a list about which case will be affected by this issue.  And we need
> to abstract one function to check packet size.
> Function input will be expected received or transmitted size and return value
> is just meet the expectation or not.
> 
> Regards,
> Marvin
> 
> > -----Original Message-----
> > From: dts [mailto:dts-bounces at dpdk.org] On Behalf Of xu,huilong
> > Sent: Tuesday, January 10, 2017 2:55 PM
> > To: dts at dpdk.org
> > Cc: Xu, HuilongX <huilongx.xu at intel.com>
> > Subject: [dts] [patch V1 2/2] update shutdown_api and jumboframes
> > check tx- packets code
> >
> > fotville nic will send lldp packet when port setup by dpdk testpmd.
> > so we need update check tx-packets code.
> > used (tx-packets - forward packet size) %  lldp packet size replace
> > tx-packets == forward packets size
> >
> > Signed-off-by: "xu,huilong" <huilongx.xu at intel.com>
> > ---
> >  tests/TestSuite_jumboframes.py  |  5 ++++-
> > tests/TestSuite_shutdown_api.py |
> > 16 ++++++++++------
> >  2 files changed, 14 insertions(+), 7 deletions(-)
> >
> > diff --git a/tests/TestSuite_jumboframes.py
> > b/tests/TestSuite_jumboframes.py index 58f2e17..bebee59 100644
> > --- a/tests/TestSuite_jumboframes.py
> > +++ b/tests/TestSuite_jumboframes.py
> > @@ -39,6 +39,7 @@ import re
> >  from time import sleep
> >  from test_case import TestCase
> >  from pmd_output import PmdOutput
> > +from settings import PROTOCOL_PACKET_SIZE
> >
> >  ETHER_HEADER_LEN = 18
> >  IP_HEADER_LEN = 20
> > @@ -93,7 +94,9 @@ class TestJumboframes(TestCase):
> >          rx_err -= rx_err_ori
> >
> >          if received:
> > -            self.verify((tx_pkts == rx_pkts) and ((tx_bytes + 4) == pktsize) and
> > ((rx_bytes + 4) == pktsize),
> > +            self.verify((tx_pkts - rx_pkts % PROTOCOL_PACKET_SIZE['lldp'] == 0)
> > +                         and ( (tx_bytes + 4 - pktsize ) %
> > + PROTOCOL_PACKET_SIZE['lldp']
> > == 0)
> > +                         and ((rx_bytes + 4) == pktsize),
> >                          "packet pass assert error")
> >          else:
> >              #self.verify(p0tx_pkts == p1rx_pkts and (p1rx_err == 1 or
> > p1rx_pkts == 0), diff --git a/tests/TestSuite_shutdown_api.py
> > b/tests/TestSuite_shutdown_api.py index 3dbacf2..5e67bf5 100644
> > --- a/tests/TestSuite_shutdown_api.py
> > +++ b/tests/TestSuite_shutdown_api.py
> > @@ -42,7 +42,7 @@ import re
> >  import os
> >  from test_case import TestCase
> >  from pmd_output import PmdOutput
> > -from settings import HEADER_SIZE
> > +from settings import HEADER_SIZE, PROTOCOL_PACKET_SIZE
> >  from exception import VerifyFailure
> >
> >  #
> > @@ -149,14 +149,18 @@ class TestShutdownApi(TestCase):
> >              if vlan is True:
> >                  # vlan strip default is on
> >                  tx_bytes_exp -= 4
> > -
> > +
> > +        # fortville nic enable send lldp packet function when port setup
> > +        # now the tx-packets size is lldp_size(110) * n + forward packe size
> > +        # so use (tx-packets - forward packet size) % lldp_size, if
> > + it is 0, it means forward packet size right
> > +
> >          if received:
> > -            self.verify(p0tx_pkts == p1rx_pkts, "Wrong TX pkts p0_tx=%d,
> > p1_rx=%d" % (p0tx_pkts, p1rx_pkts))
> > +            self.verify((p0tx_pkts - p1rx_pkts) %
> > + PROTOCOL_PACKET_SIZE['lldp'] == 0, "Wrong TX pkts p0_tx=%d,
> p1_rx=%d"
> > + % (p0tx_pkts, p1rx_pkts))
> >              self.verify(p1rx_bytes == rx_bytes_exp, "Wrong Rx bytes
> > p1_rx=%d, expect=%d" % (p1rx_bytes, rx_bytes_exp))
> > -            self.verify(p0tx_bytes == tx_bytes_exp, "Wrong Tx bytes p0_tx=%d,
> > expect=%d" % (p0tx_bytes, tx_bytes_exp))
> > +            self.verify((p0tx_bytes - tx_bytes_exp) %
> > + PROTOCOL_PACKET_SIZE['lldp'] == 0, "Wrong Tx bytes p0_tx=%d,
> > + expect=%d" % (p0tx_bytes, tx_bytes_exp))
> >          else:
> > -            self.verify(p0tx_pkts == 0, "Packet not dropped p0tx_pkts=%d" %
> > p0tx_pkts)
> > -            self.verify(p0tx_bytes == 0, "Packet not dropped p0tx_bytes=%d" %
> > p0tx_bytes)
> > +            self.verify(p0tx_pkts % PROTOCOL_PACKET_SIZE['lldp'] ==
> > + 0, "Packet not
> > dropped p0tx_pkts=%d" % p0tx_pkts)
> > +            self.verify(p0tx_bytes % PROTOCOL_PACKET_SIZE['lldp'] ==
> > + 0, "Packet not dropped p0tx_bytes=%d" % p0tx_bytes)
> >
> >      def check_ports(self, status=True):
> >          """
> > --
> > 1.9.3