From: "Liu, Yong" <yong.liu@intel.com>
To: "xu,huilong" <huilongx.xu@intel.com>, dts@dpdk.org
Subject: Re: [dts] [PATCH V1] fix dynamic default model failed
Date: Thu, 18 Aug 2016 16:02:09 +0800 [thread overview]
Message-ID: <57B56B81.3030005@intel.com> (raw)
In-Reply-To: <1470883144-6643-1-git-send-email-huilongx.xu@intel.com>
Applied, thanks.
On 08/11/2016 10:39 AM, xu,huilong wrote:
> update list:
> 1. used port 1 TX Packets replace port 0 Rx packets for check count received packet.
> because some nic add RX Packets although NIC not received packet.
> 2. kill testpmd when one case run finish, and setup testpmd before run case.
> because when default model case at last, the last case maybe will changed the config.
>
> Signed-off-by: xu,huilong <huilongx.xu@intel.com>
> ---
> tests/TestSuite_dynamic_config.py | 118 +++++++++++++++-----------------------
> 1 file changed, 46 insertions(+), 72 deletions(-)
>
> diff --git a/tests/TestSuite_dynamic_config.py b/tests/TestSuite_dynamic_config.py
> index 7df02b7..45beb62 100644
> --- a/tests/TestSuite_dynamic_config.py
> +++ b/tests/TestSuite_dynamic_config.py
> @@ -64,19 +64,18 @@ class TestDynamicConfig(TestCase):
>
> # Based on h/w type, choose how many ports to use
> self.dut_ports = self.dut.get_ports(self.nic)
> - print self.dut_ports
>
> # Verify that enough ports are available
> self.verify(len(self.dut_ports) >= 2, "Insufficient ports")
>
> # Prepare cores and ports
> cores = self.dut.get_core_list('1S/2C/2T')
> - coreMask = dts.create_mask(cores)
> - portMask = dts.create_mask(self.dut_ports[:2])
> + self.coreMask = dts.create_mask(cores)
> + self.portMask = dts.create_mask(self.dut_ports[:2])
>
> # launch app
> cmd = "./%s/build/app/test-pmd/testpmd -c %s -n 3 -- -i --rxpt=0 \
> - --rxht=0 --rxwt=0 --txpt=39 --txht=0 --txwt=0 --portmask=%s" % (self.target, coreMask, portMask)
> + --rxht=0 --rxwt=0 --txpt=39 --txht=0 --txwt=0 --portmask=%s" % (self.target, self.coreMask, self.portMask)
>
> self.dut.send_expect("%s" % cmd, "testpmd> ", 120)
>
> @@ -93,7 +92,8 @@ class TestDynamicConfig(TestCase):
> self.verify(cmp(ret.lower(), self.dest) == 0, "MAC address wrong")
> self.verify("Promiscuous mode: enabled" in out,
> "wrong default promiscuous value")
> - self.dut.send_expect("start", "testpmd> ", 120)
> +
> + self.dut.kill_all()
>
> def dynamic_config_send_packet(self, portid, destMac="00:11:22:33:44:55"):
> """
> @@ -112,7 +112,12 @@ class TestDynamicConfig(TestCase):
> """
> Run before each test case.
> """
> - pass
> + cmd = "./%s/build/app/test-pmd/testpmd -c %s -n 3 -- -i --rxpt=0 \
> + --rxht=0 --rxwt=0 --txpt=39 --txht=0 --txwt=0 --portmask=%s" % (self.target, self.coreMask, self.portMask)
> +
> + self.dut.send_expect("%s" % cmd, "testpmd> ", 120)
> + self.dut.send_expect("start", "testpmd> ", 120)
> +
>
> def test_dynamic_config_default_mode(self):
> """
> @@ -123,15 +128,15 @@ class TestDynamicConfig(TestCase):
>
> # get the current rx statistic
> out = self.dut.send_expect("clear port stats all" , "testpmd> ")
> - out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
> - cur_rxpkt = dts.regexp(out, "RX-packets: ([0-9]+)")
> + out = self.dut.send_expect("show port stats %d" % self.dut_ports[1], "testpmd> ")
> + cur_rxpkt = dts.regexp(out, "TX-packets: ([0-9]+)")
>
> # send one packet with different MAC address than the portid
> self.dynamic_config_send_packet(portid)
>
> pre_rxpkt = cur_rxpkt
> - out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
> - cur_rxpkt = dts.regexp(out, "RX-packets: ([0-9]+)")
> + out = self.dut.send_expect("show port stats %d" % self.dut_ports[1], "testpmd> ")
> + cur_rxpkt = dts.regexp(out, "TX-packets: ([0-9]+)")
>
> # check the pakcet increasment
> self.verify(int(cur_rxpkt) == int(pre_rxpkt)
> @@ -141,8 +146,8 @@ class TestDynamicConfig(TestCase):
> self.dynamic_config_send_packet(portid, self.dest)
>
> pre_rxpkt = cur_rxpkt
> - out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
> - cur_rxpkt = dts.regexp(out, "RX-packets: ([0-9]+)")
> + out = self.dut.send_expect("show port stats %d" % self.dut_ports[1], "testpmd> ")
> + cur_rxpkt = dts.regexp(out, "TX-packets: ([0-9]+)")
>
> # check the pakcet increasment
> self.verify(int(cur_rxpkt) == int(pre_rxpkt)
> @@ -154,57 +159,26 @@ class TestDynamicConfig(TestCase):
> """
>
> portid = self.dut_ports[0]
> - if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]:
> - self.dut.send_expect("set promisc all off", "testpmd> ")
> - out = self.dut.send_expect(
> - "show port stats %d" % self.dut_ports[1], "testpmd> ")
> - cur_rxpkt = dts.regexp(out, "TX-packets: ([0-9]+)")
> -
> - self.dynamic_config_send_packet(portid)
> - pre_rxpkt = cur_rxpkt
> - out = self.dut.send_expect(
> - "show port stats %d" % self.dut_ports[1], "testpmd> ")
> - cur_rxpkt = dts.regexp(out, "TX-packets: ([0-9]+)")
> - self.verify(int(cur_rxpkt) == int(
> - pre_rxpkt), "1st packet increasment error")
> - self.dynamic_config_send_packet(portid, self.dest)
> - pre_rxpkt = cur_rxpkt
> - out = self.dut.send_expect(
> - "show port stats %d" % self.dut_ports[1], "testpmd> ")
> - cur_rxpkt = dts.regexp(out, "TX-packets: ([0-9]+)")
> - self.verify(int(cur_rxpkt) == int(
> - pre_rxpkt) + 1, "2nd packet increasment error")
> - else:
> - self.dut.send_expect("set promisc %d off" % portid, "testpmd> ")
> -
> - # get the current rx statistic
> - out = self.dut.send_expect(
> - "show port stats %d" % portid, "testpmd> ")
> - cur_rxpkt = dts.regexp(out, "RX-packets: ([0-9]+)")
> -
> - # send one packet with different MAC address than the portid
> - self.dynamic_config_send_packet(portid)
> -
> - pre_rxpkt = cur_rxpkt
> - out = self.dut.send_expect(
> - "show port stats %d" % portid, "testpmd> ")
> - cur_rxpkt = dts.regexp(out, "RX-packets: ([0-9]+)")
> -
> - # check the pakcet increasment
> - self.verify(int(cur_rxpkt) == int(
> - pre_rxpkt), "1st packet increasment error")
> -
> - # send one packet with the portid MAC address
> - self.dynamic_config_send_packet(portid, self.dest)
> -
> - pre_rxpkt = cur_rxpkt
> - out = self.dut.send_expect(
> - "show port stats %d" % portid, "testpmd> ")
> - cur_rxpkt = dts.regexp(out, "RX-packets: ([0-9]+)")
> -
> - # check the pakcet increasment
> - self.verify(int(cur_rxpkt) == int(
> - pre_rxpkt) + 1, "2nd packet increasment error")
> +
> + self.dut.send_expect("set promisc all off", "testpmd> ")
> + out = self.dut.send_expect(
> + "show port stats %d" % self.dut_ports[1], "testpmd> ")
> + cur_rxpkt = dts.regexp(out, "TX-packets: ([0-9]+)")
> +
> + self.dynamic_config_send_packet(portid)
> + pre_rxpkt = cur_rxpkt
> + out = self.dut.send_expect(
> + "show port stats %d" % self.dut_ports[1], "testpmd> ")
> + cur_rxpkt = dts.regexp(out, "TX-packets: ([0-9]+)")
> + self.verify(int(cur_rxpkt) == int(
> + pre_rxpkt), "1st packet increasment error")
> + self.dynamic_config_send_packet(portid, self.dest)
> + pre_rxpkt = cur_rxpkt
> + out = self.dut.send_expect(
> + "show port stats %d" % self.dut_ports[1], "testpmd> ")
> + cur_rxpkt = dts.regexp(out, "TX-packets: ([0-9]+)")
> + self.verify(int(cur_rxpkt) == int(
> + pre_rxpkt) + 1, "2nd packet increasment error")
>
> def test_dynamic_config_broadcast(self):
> """
> @@ -269,15 +243,15 @@ class TestDynamicConfig(TestCase):
> self.dut.send_expect("set promisc %d on" % portid, "testpmd> ")
>
> # get the current rx statistic
> - out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
> - cur_rxpkt = dts.regexp(out, "RX-packets: ([0-9]+)")
> + out = self.dut.send_expect("show port stats %d" % self.dut_ports[1], "testpmd> ")
> + cur_rxpkt = dts.regexp(out, "TX-packets: ([0-9]+)")
>
> # send one packet with different MAC address than the portid
> self.dynamic_config_send_packet(portid)
>
> pre_rxpkt = cur_rxpkt
> - out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
> - cur_rxpkt = dts.regexp(out, "RX-packets: ([0-9]+)")
> + out = self.dut.send_expect("show port stats %d" % self.dut_ports[1], "testpmd> ")
> + cur_rxpkt = dts.regexp(out, "TX-packets: ([0-9]+)")
>
> # check the pakcet increasment
> self.verify(int(cur_rxpkt) == int(pre_rxpkt)
> @@ -287,21 +261,21 @@ class TestDynamicConfig(TestCase):
> self.dynamic_config_send_packet(portid, self.dest)
>
> pre_rxpkt = cur_rxpkt
> - out = self.dut.send_expect("show port stats %d" % portid, "testpmd> ")
> - cur_rxpkt = dts.regexp(out, "RX-packets: ([0-9]+)")
> + out = self.dut.send_expect("show port stats %d" % self.dut_ports[1], "testpmd> ")
> + cur_rxpkt = dts.regexp(out, "TX-packets: ([0-9]+)")
>
> # check the pakcet increasment
> self.verify(int(cur_rxpkt) == int(pre_rxpkt)
> + 1, "2nd packet increasment error")
>
> - self.dut.send_expect("quit", "# ", 30)
> + #self.dut.send_expect("quit", "# ", 30)
>
> def tear_down(self):
> """
> Run after each test case.
> """
> - pass
> -
> + self.dut.kill_all()
> +
> def tear_down_all(self):
> """
> Run after each test suite.
prev parent reply other threads:[~2016-08-18 7:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-11 2:39 xu,huilong
2016-08-18 8:02 ` Liu, Yong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57B56B81.3030005@intel.com \
--to=yong.liu@intel.com \
--cc=dts@dpdk.org \
--cc=huilongx.xu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).