From: "Tu, Lijuan" <lijuan.tu@intel.com>
To: "Mo, YufengX" <yufengx.mo@intel.com>,
"dts@dpdk.org" <dts@dpdk.org>,
"Ma, LihongX" <lihongx.ma@intel.com>,
"Zhang, XiX" <xix.zhang@intel.com>
Cc: "Mo, YufengX" <yufengx.mo@intel.com>
Subject: Re: [dts] [PATCH V1 1/1] tests/kni: resolve ping command compatibility
Date: Tue, 12 May 2020 07:37:20 +0000 [thread overview]
Message-ID: <8CE3E05A3F976642AAB0F4675D0AD20E0BC2A3B9@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <20200511022959.11225-2-yufengx.mo@intel.com>
Applied, thanks
> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of yufengmx
> Sent: Monday, May 11, 2020 10:30 AM
> To: dts@dpdk.org; Ma, LihongX <lihongx.ma@intel.com>; Zhang, XiX
> <xix.zhang@intel.com>
> Cc: Mo, YufengX <yufengx.mo@intel.com>
> Subject: [dts] [PATCH V1 1/1] tests/kni: resolve ping command compatibility
>
>
> fix previous version missing merged code.
> add more redundant processing.
>
> Signed-off-by: yufengmx <yufengx.mo@intel.com>
> ---
> tests/TestSuite_kni.py | 53 ++++++++++++++++++++++++++----------------
> 1 file changed, 33 insertions(+), 20 deletions(-)
>
> diff --git a/tests/TestSuite_kni.py b/tests/TestSuite_kni.py index
> 41d8fbe..2b2281d 100644
> --- a/tests/TestSuite_kni.py
> +++ b/tests/TestSuite_kni.py
> @@ -571,9 +571,9 @@ class TestKni(TestCase):
> v_intf_ip = f"192.168.{port}.1"
> tx_intf_ip = f"192.168.{port}.2"
> self.dut.send_expect(
> - "ifconfig %s %s netmask 255.255.255.192" % (v_intf_ip, port), "# ")
> + "ifconfig %s %s netmask 255.255.255.192" %
> + (virtual_interface, v_intf_ip), "# ")
> self.tester.send_expect(
> - "ifconfig %s %s netmask 255.255.255.192" % (tx_intf_ip, port), "# ")
> + "ifconfig %s %s netmask 255.255.255.192" %
> + (tx_interface, tx_intf_ip), "# ")
> ports_ips[port] = [tx_intf_ip, v_intf_ip]
> self.tester.enable_ipv6(tx_interface)
> time.sleep(5)
> @@ -588,35 +588,45 @@ class TestKni(TestCase):
>
> out = self.dut.send_expect(
> "ping -w 2 -I %s 192.168.%d.2" % (v_intf_ip, port), "# ", 10)
> - self.verify("64 bytes from 192.168.%d.2:" %
> - port in out, "ping not supported")
> -
> + out1 = self.dut.send_expect(
> + "ping -w 2 -I %s 192.168.%d.2" % (virtual_interface, port), "# ", 10)
> + expected_str = "64 bytes from 192.168.%d.2:" % port
> + self.verify(any([expected_str in out, expected_str in out1]),
> + "ping not supported")
> out = self.tester.send_expect(
> "ping -w 1 -I %s 192.168.%d.1" % (tx_intf_ip, port), "# ", 10)
> - self.verify("64 bytes from 192.168.%d.1:" %
> - port in out, "kni cannot reply ping packet")
> -
> + out1 = self.tester.send_expect(
> + "ping -w 1 -I %s 192.168.%d.1" % (tx_interface, port), "# ", 10)
> + expected_str = "64 bytes from 192.168.%d.1:" % port
> + self.verify(any([expected_str in out, expected_str in out1]),
> + "kni cannot reply ping packet")
> out = self.dut.send_expect(
> "ping -w 1 -I %s 192.168.%d.123" % (v_intf_ip, port), "# ", 10)
> - self.verify(
> - "0 received, 100% packet loss" in out, "ping not supported")
> -
> + out1 = self.dut.send_expect(
> + "ping -w 1 -I %s 192.168.%d.123" % (virtual_interface, port), "# ",
> 10)
> + expected_str = "0 received, 100% packet loss"
> + self.verify(all([expected_str in out, expected_str in out1]),
> + "ping not supported")
> out = self.dut.send_expect(
> "ip -family inet6 address show dev %s | awk '/inet6/ { print $2 }'|
> cut -d'/' -f1" % virtual_interface, "# ", 10)
> ipv6_address = out.split('\r\n')[0]
> -
> + self.tester.send_expect("ifconfig %s up" % tx_interface, "#
> + ")
> out = self.dut.send_expect("ping6 -w 1 -I %s %s" %
> (v_intf_ip, str(ipv6_address)), "# ", 10)
> + out1 = self.dut.send_expect("ping6 -w 1 -I %s %s" %
> + (virtual_interface,
> + str(ipv6_address)), "# ", 10)
> # FC25 ping6 output info is "64 bytes from ipv6_address%v:
> icmp_seq=1 ttl=64"
> # other os ping6 output is "64 bytes from ipv6_address: icmp_seq=1
> ttl=64"
> - self.verify("64 bytes from %s" %
> - ipv6_address in out, "ping6 not supported")
> -
> + expected_str = "64 bytes from %s" % ipv6_address
> + self.verify(any([expected_str in out, expected_str in out1]),
> + "ping6 not supported")
> out = self.tester.send_expect(
> "ping6 -w 1 -I %s %s" % (tx_intf_ip, str(ipv6_address)), "# ", 10)
> - self.verify("64 bytes from %s" %
> - ipv6_address in out, "kni cannot reply ping6 packet")
> -
> + out1 = self.tester.send_expect(
> + "ping6 -w 1 -I %s %s" % (tx_interface, str(ipv6_address)), "# ", 10)
> + expected_str = "64 bytes from %s" % ipv6_address
> + self.verify(any([expected_str in out, expected_str in out1]),
> + "kni cannot reply ping6 packet")
> ipv6list = list(ipv6_address)
> for j in range(10):
> if str(j) == ipv6list[-1]:
> @@ -627,8 +637,11 @@ class TestKni(TestCase):
>
> out = self.dut.send_expect("ping6 -w 1 -I %s %s" %
> (v_intf_ip, ''.join(ipv6list)), "# ", 10)
> - self.verify(
> - "0 received, 100% packet loss" in out, "ping6 not supported")
> + out1 = self.dut.send_expect("ping6 -w 1 -I %s %s" %
> + (virtual_interface, ''.join(ipv6list)), "# ", 10)
> + expected_str = "0 received, 100% packet loss"
> + self.verify(any([expected_str in out, expected_str in out1]),
> + "ping6 not supported")
> # remove ip from tester
> self.tester.send_expect(
> "ip addr del 192.168.%d.2 dev %s" % (port, tx_interface), "# ")
> --
> 2.21.0
next prev parent reply other threads:[~2020-05-12 7:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 2:29 [dts] [PATCH V1 0/1] " yufengmx
2020-05-11 2:29 ` [dts] [PATCH V1 1/1] " yufengmx
2020-05-11 2:34 ` Zhang, XiX
2020-05-12 7:37 ` Tu, Lijuan [this message]
2020-05-11 2:34 ` [dts] [PATCH V1 0/1] " Zhang, XiX
-- strict thread matches above, loose matches on Subject: below --
2020-04-30 8:55 yufengmx
2020-04-30 8:55 ` [dts] [PATCH V1 1/1] " yufengmx
2020-05-06 5:47 ` Tu, Lijuan
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=8CE3E05A3F976642AAB0F4675D0AD20E0BC2A3B9@SHSMSX101.ccr.corp.intel.com \
--to=lijuan.tu@intel.com \
--cc=dts@dpdk.org \
--cc=lihongx.ma@intel.com \
--cc=xix.zhang@intel.com \
--cc=yufengx.mo@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).