[dts] [PATCH V1] fix enable and disable ipv6 on FreeBSD

[dts] [PATCH V1] fix enable and disable ipv6 on FreeBSD

[xu,gang]

Signed-off-by: xu,gang <gangx.xu@intel.com>
---
 nics/net_device.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nics/net_device.py b/nics/net_device.py
index 39bd4e5..bbe4bed 100644
--- a/nics/net_device.py
+++ b/nics/net_device.py
@@ -422,7 +422,11 @@ class NetDevice(object):
             self.__send_expect("ifconfig %s up" % intf, "# ")
 
     def enable_ipv6_freebsd(self, intf):
-        pass
+        self.__send_expect("sysctl net.ipv6.conf.%s.disable_ipv6=0" %
+                           intf, "# ")
+        self.__send_expect("ifconfig %s down" % intf, "# ")
+        self.__send_expect("ifconfig %s up" % intf, "# ")
+
 
     @nic_has_driver
     def disable_ipv6(self):
@@ -443,7 +447,10 @@ class NetDevice(object):
                            intf, "# ")
 
     def disable_ipv6_freebsd(self, intf):
-        pass
+        self.__send_expect("sysctl net.ipv6.conf.%s.disable_ipv6=1" %
+                           intf, "# ")
+        self.__send_expect("ifconfig %s down" % intf, "# ")
+        self.__send_expect("ifconfig %s up" % intf, "# ")
 
     @nic_has_driver
     def get_ipv6_addr(self):
-- 
1.9.3

[dts] [PATCH V1 1/4] fix test suite coremask

[xu,gang]

Signed-off-by: xu,gang <gangx.xu@intel.com>
---
 tests/TestSuite_coremask.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestSuite_coremask.py b/tests/TestSuite_coremask.py
index 9fd039d..2458d8f 100644
--- a/tests/TestSuite_coremask.py
+++ b/tests/TestSuite_coremask.py
@@ -104,7 +104,7 @@ class TestCoremask(TestCase):
         Check coremask parsing for more cores than available.
         """
 
-        command_line = """./%s/app/test -c %s -n %d --log-level 8|tee out"""
+        command_line = """./%s/app/test -c %s -n %d --log-level 8 2 > &1 |tee out"""
 
         # Default big coremask value 128
         big_coremask_size = 128
-- 
1.9.3

[dts] [PATCH V1 2/4] fix TestSuite unit_tests_lpm

[xu,gang]

Signed-off-by: xu,gang <gangx.xu@intel.com>
---
 tests/TestSuite_unit_tests_lpm.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/TestSuite_unit_tests_lpm.py b/tests/TestSuite_unit_tests_lpm.py
index dadb492..253cbb4 100644
--- a/tests/TestSuite_unit_tests_lpm.py
+++ b/tests/TestSuite_unit_tests_lpm.py
@@ -83,16 +83,19 @@ class TestUnitTestsLpmIpv6(TestCase):
         """
         [arch, machine, env, toolchain] = self.target.split('-')
         self.verify(arch == "x86_64", "lpm6 request huge memory")
-
-        hugepage_ori = self.dut.get_total_huge_pages()
-        self.dut.set_huge_pages(4096)
-        hugepage_num = self.dut.get_total_huge_pages()
-        self.verify(hugepage_num >= 4096, "failed to request huge memory")
+        if env == 'bsdapp':
+            self.dut.send_expect("kenv hw.contigmem.num_buffers=4", "#", 60)
+        else:
+            hugepage_ori = self.dut.get_total_huge_pages()
+            page_size = self.dut.send_expect("awk '/Hugepagesize/ {print $2}' /proc/meminfo", "# ")
+            if hugepage_ori * int(page_size) <= 4096 * 2048:
+                self.dut.set_huge_pages(4096)
+                hugepage_num = self.dut.get_total_huge_pages()
+                self.verify(hugepage_num >= 4096, "failed to request huge memory")
 
         self.dut.send_expect("./app/test/test -n 1 -c ffff", "R.*T.*E.*>.*>", 60)
         out = self.dut.send_expect("lpm6_autotest", "RTE>>", 3600)
         self.dut.send_expect("quit", "# ")
-        self.dut.set_huge_pages(hugepage_ori)
         self.verify("Test OK" in out, "Test failed")
 
     def tear_down(self):
-- 
1.9.3

[dts] [PATCH V1 3/4] fix TestSuite unit_tests_mbuf

[xu,gang]

Signed-off-by: xu,gang <gangx.xu@intel.com>
---
 tests/TestSuite_unit_tests_mbuf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/TestSuite_unit_tests_mbuf.py b/tests/TestSuite_unit_tests_mbuf.py
index c4dfaab..9493139 100644
--- a/tests/TestSuite_unit_tests_mbuf.py
+++ b/tests/TestSuite_unit_tests_mbuf.py
@@ -71,7 +71,7 @@ class TestUnitTestsMbuf(TestCase):
         """
 
         self.dut.send_expect("./app/test/test -n 1 -c ffff", "R.*T.*E.*>.*>", 60)
-        out = self.dut.send_expect("mbuf_autotest", "RTE>>", 60)
+        out = self.dut.send_expect("mbuf_autotest", "RTE>>", 300)
         self.dut.send_expect("quit", "# ")
         self.verify("Test OK" in out, "Test failed")
 
-- 
1.9.3

[dts] [PATCH V1 4/4] fix TestSuite unit_tests_ringpmd

[xu,gang]

Signed-off-by: xu,gang <gangx.xu@intel.com>
---
 tests/TestSuite_unit_tests_ringpmd.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/TestSuite_unit_tests_ringpmd.py b/tests/TestSuite_unit_tests_ringpmd.py
index 2c83bcd..05305ff 100644
--- a/tests/TestSuite_unit_tests_ringpmd.py
+++ b/tests/TestSuite_unit_tests_ringpmd.py
@@ -71,12 +71,12 @@ class TestUnitTestsRingPmd(TestCase):
         """
         dev_str = "--vdev=eth_ring0 --vdev=eth_ring1"
 
-        self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>", 10)
+        self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target, "R.*T.*E.*>.*>", 120)
         out = self.dut.send_expect("ring_pmd_autotest", "RTE>>", 120)
         self.dut.send_expect("quit", "# ")
         self.verify("Test OK" in out, "Default no eth_ring devices Test failed")
 
-        self.dut.send_expect("./%s/app/test -n 1 -c ffff %s" % (self.target, dev_str), "R.*T.*E.*>.*>", 10)
+        self.dut.send_expect("./%s/app/test -n 1 -c ffff %s" % (self.target, dev_str), "R.*T.*E.*>.*>", 120)
         out = self.dut.send_expect("ring_pmd_autotest", "RTE>>", 120)
         self.dut.send_expect("quit", "# ")
         self.verify("Test OK" in out, "Two eth_ring devices test failed")
-- 
1.9.3

Re: [dts] [PATCH V1 4/4] fix TestSuite unit_tests_ringpmd

[Liu, Yong]

Hi Gang, please add more comments about your environment. We need more information about why need enlarge waiting time.

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of xu,gang
> Sent: Wednesday, September 21, 2016 3:20 PM
> To: dts@dpdk.org
> Cc: Xu, GangX
> Subject: [dts] [PATCH V1 4/4] fix TestSuite unit_tests_ringpmd
> 
> Signed-off-by: xu,gang <gangx.xu@intel.com>
> ---
>  tests/TestSuite_unit_tests_ringpmd.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/TestSuite_unit_tests_ringpmd.py
> b/tests/TestSuite_unit_tests_ringpmd.py
> index 2c83bcd..05305ff 100644
> --- a/tests/TestSuite_unit_tests_ringpmd.py
> +++ b/tests/TestSuite_unit_tests_ringpmd.py
> @@ -71,12 +71,12 @@ class TestUnitTestsRingPmd(TestCase):
>          """
>          dev_str = "--vdev=eth_ring0 --vdev=eth_ring1"
> 
> -        self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target,
> "R.*T.*E.*>.*>", 10)
> +        self.dut.send_expect("./%s/app/test -n 1 -c ffff" % self.target,
> "R.*T.*E.*>.*>", 120)
>          out = self.dut.send_expect("ring_pmd_autotest", "RTE>>", 120)
>          self.dut.send_expect("quit", "# ")
>          self.verify("Test OK" in out, "Default no eth_ring devices Test
> failed")
> 
> -        self.dut.send_expect("./%s/app/test -n 1 -c ffff %s" %
> (self.target, dev_str), "R.*T.*E.*>.*>", 10)
> +        self.dut.send_expect("./%s/app/test -n 1 -c ffff %s" %
> (self.target, dev_str), "R.*T.*E.*>.*>", 120)
>          out = self.dut.send_expect("ring_pmd_autotest", "RTE>>", 120)
>          self.dut.send_expect("quit", "# ")
>          self.verify("Test OK" in out, "Two eth_ring devices test failed")
> --
> 1.9.3

Re: [dts] [PATCH V1 3/4] fix TestSuite unit_tests_mbuf

[Liu, Yong]

Same comment as "[PATCH V1 4/4] fix TestSuite unit_tests_ringpmd".

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of xu,gang
> Sent: Wednesday, September 21, 2016 3:20 PM
> To: dts@dpdk.org
> Cc: Xu, GangX
> Subject: [dts] [PATCH V1 3/4] fix TestSuite unit_tests_mbuf
> 
> Signed-off-by: xu,gang <gangx.xu@intel.com>
> ---
>  tests/TestSuite_unit_tests_mbuf.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/TestSuite_unit_tests_mbuf.py
> b/tests/TestSuite_unit_tests_mbuf.py
> index c4dfaab..9493139 100644
> --- a/tests/TestSuite_unit_tests_mbuf.py
> +++ b/tests/TestSuite_unit_tests_mbuf.py
> @@ -71,7 +71,7 @@ class TestUnitTestsMbuf(TestCase):
>          """
> 
>          self.dut.send_expect("./app/test/test -n 1 -c ffff",
> "R.*T.*E.*>.*>", 60)
> -        out = self.dut.send_expect("mbuf_autotest", "RTE>>", 60)
> +        out = self.dut.send_expect("mbuf_autotest", "RTE>>", 300)
>          self.dut.send_expect("quit", "# ")
>          self.verify("Test OK" in out, "Test failed")
> 
> --
> 1.9.3

Re: [dts] [PATCH V1] fix enable and disable ipv6 on FreeBSD

[Liu, Yong]

Thanks gang. Applied into master branch.

On 09/21/2016 03:20 PM, xu,gang wrote:
> Signed-off-by: xu,gang <gangx.xu@intel.com>
> ---
>   nics/net_device.py | 11 +++++++++--
>   1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/nics/net_device.py b/nics/net_device.py
> index 39bd4e5..bbe4bed 100644
> --- a/nics/net_device.py
> +++ b/nics/net_device.py
> @@ -422,7 +422,11 @@ class NetDevice(object):
>               self.__send_expect("ifconfig %s up" % intf, "# ")
>   
>       def enable_ipv6_freebsd(self, intf):
> -        pass
> +        self.__send_expect("sysctl net.ipv6.conf.%s.disable_ipv6=0" %
> +                           intf, "# ")
> +        self.__send_expect("ifconfig %s down" % intf, "# ")
> +        self.__send_expect("ifconfig %s up" % intf, "# ")
> +
>   
>       @nic_has_driver
>       def disable_ipv6(self):
> @@ -443,7 +447,10 @@ class NetDevice(object):
>                              intf, "# ")
>   
>       def disable_ipv6_freebsd(self, intf):
> -        pass
> +        self.__send_expect("sysctl net.ipv6.conf.%s.disable_ipv6=1" %
> +                           intf, "# ")
> +        self.__send_expect("ifconfig %s down" % intf, "# ")
> +        self.__send_expect("ifconfig %s up" % intf, "# ")
>   
>       @nic_has_driver
>       def get_ipv6_addr(self):

Re: [dts] [PATCH V1 1/4] fix test suite coremask

[Liu, Yong]

Gang, could u please give the reason in commit log. It look like some 
useful information moved to stderr.

On 09/21/2016 03:20 PM, xu,gang wrote:
> Signed-off-by: xu,gang <gangx.xu@intel.com>
> ---
>   tests/TestSuite_coremask.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/TestSuite_coremask.py b/tests/TestSuite_coremask.py
> index 9fd039d..2458d8f 100644
> --- a/tests/TestSuite_coremask.py
> +++ b/tests/TestSuite_coremask.py
> @@ -104,7 +104,7 @@ class TestCoremask(TestCase):
>           Check coremask parsing for more cores than available.
>           """
>   
> -        command_line = """./%s/app/test -c %s -n %d --log-level 8|tee out"""
> +        command_line = """./%s/app/test -c %s -n %d --log-level 8 2 > &1 |tee out"""
>   
>           # Default big coremask value 128
>           big_coremask_size = 128

Re: [dts] [PATCH V1 2/4] fix TestSuite unit_tests_lpm

[Liu, Yong]

Hi gang, test suite is not the right instance to handle hugepage. We 
have planned to let unified module to handle this.
My suggestion is that just increased default FreeBSD huge page memory 
size in framework.
And warning that huge page is insufficient in linux OS.

On 09/21/2016 03:20 PM, xu,gang wrote:
> Signed-off-by: xu,gang <gangx.xu@intel.com>
> ---
>   tests/TestSuite_unit_tests_lpm.py | 15 +++++++++------
>   1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/tests/TestSuite_unit_tests_lpm.py b/tests/TestSuite_unit_tests_lpm.py
> index dadb492..253cbb4 100644
> --- a/tests/TestSuite_unit_tests_lpm.py
> +++ b/tests/TestSuite_unit_tests_lpm.py
> @@ -83,16 +83,19 @@ class TestUnitTestsLpmIpv6(TestCase):
>           """
>           [arch, machine, env, toolchain] = self.target.split('-')
>           self.verify(arch == "x86_64", "lpm6 request huge memory")
> -
> -        hugepage_ori = self.dut.get_total_huge_pages()
> -        self.dut.set_huge_pages(4096)
> -        hugepage_num = self.dut.get_total_huge_pages()
> -        self.verify(hugepage_num >= 4096, "failed to request huge memory")
> +        if env == 'bsdapp':
> +            self.dut.send_expect("kenv hw.contigmem.num_buffers=4", "#", 60)
> +        else:
> +            hugepage_ori = self.dut.get_total_huge_pages()
> +            page_size = self.dut.send_expect("awk '/Hugepagesize/ {print $2}' /proc/meminfo", "# ")
> +            if hugepage_ori * int(page_size) <= 4096 * 2048:
> +                self.dut.set_huge_pages(4096)
> +                hugepage_num = self.dut.get_total_huge_pages()
> +                self.verify(hugepage_num >= 4096, "failed to request huge memory")
>   
>           self.dut.send_expect("./app/test/test -n 1 -c ffff", "R.*T.*E.*>.*>", 60)
>           out = self.dut.send_expect("lpm6_autotest", "RTE>>", 3600)
>           self.dut.send_expect("quit", "# ")
> -        self.dut.set_huge_pages(hugepage_ori)
>           self.verify("Test OK" in out, "Test failed")
>   
>       def tear_down(self):