[dts] [PATCH V1] fix vlan filter off in invalid

[dts] [PATCH V1] fix vlan filter off in invalid

[xu,gang]

Before the dpdk commit 8b9bd0efe0b6920a08e28eebacf2bb916bdf5653
VLAN filter and VLAN strip are enabled in testpmd by default.
But since this commit ,they are disabled by default.
so "vlam set filter off 0" can't be expected,
need "vlan set filter on 0" first

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

diff --git a/tests/TestSuite_generic_filter.py b/tests/TestSuite_generic_filter.py
index e69246b..cc7934b 100644
--- a/tests/TestSuite_generic_filter.py
+++ b/tests/TestSuite_generic_filter.py
@@ -103,8 +103,12 @@ class TestGeneric_filter(TestCase):
             self.dut.send_expect(
                 "vlan set strip off %s" % valports[1], "testpmd> ")
             self.dut.send_expect(
+                "vlan set filter on %s" % valports[0], "testpmd> ")
+            self.dut.send_expect(
                 "vlan set filter off %s" % valports[0], "testpmd> ")
             self.dut.send_expect(
+                "vlan set filter on %s" % valports[1], "testpmd> ")
+            self.dut.send_expect(
                 "vlan set filter off %s" % valports[1], "testpmd> ")
 
         self.dut.send_expect("set flush_rx on", "testpmd> ")
-- 
1.9.3

[dts] [PATCH V1] modify unit_tests_dump keyword matching

[xu,gang]

in dpdk-18.05-rc4, the dpdk prompt information change,
the patch modify corresponding keywords

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

diff --git a/tests/TestSuite_unit_tests_dump.py b/tests/TestSuite_unit_tests_dump.py
index f7985f2..a22afe9 100644
--- a/tests/TestSuite_unit_tests_dump.py
+++ b/tests/TestSuite_unit_tests_dump.py
@@ -127,7 +127,7 @@ class TestUnitTestsDump(TestCase):
         out = self.dut.send_expect("dump_physmem", "RTE>>", self.run_cmd_time * 2)
         self.dut.send_expect("quit", "# ")
         elements = ['Segment', 'IOVA', 'len', 'virt', 'socket_id', 'hugepage_sz', 'nchannel', 'nrank']
-        match_regex = "Segment (\d)+:"
+        match_regex = "Segment (.*?):"
         for element in elements[1:-1]:
             match_regex += " %s:(.*?)," % element
         match_regex += " %s:(.*?)" % elements[-1]
@@ -152,14 +152,13 @@ class TestUnitTestsDump(TestCase):
         out = self.dut.send_expect("dump_memzone", "testpmd>", self.run_cmd_time * 2)
         self.dut.send_expect("quit", "# ")
 
-        elements = ['Zone', 'name', 'IO', 'len', 'virt', 'socket_id', 'flags']
+        elements = ['Zone', 'name', 'len', 'virt', 'socket_id', 'flags']
         match_regex = "Zone (\d):"
         for element in elements[1:-1]:
             match_regex += " %s:(.*?)," % element
         match_regex += " %s:(.*?)\n" % elements[-1]
         m = re.compile(r"%s" % match_regex, re.DOTALL)
         results = m.findall(out)
-
         memzone_info = []
         for result in results:
             memzone_info.append(dict(zip(elements, result)))
@@ -180,6 +179,7 @@ class TestUnitTestsDump(TestCase):
             match_regex += "sizeof\(%s\) = (\d+)\r\n" % element
         match_regex += "sizeof\(%s\) = (\d+)" % elements[-1]
         m = re.compile(r"%s" % match_regex, re.S)
+        
         result = m.search(out)
         struct_info = dict(zip(elements, result.groups()))
 
-- 
1.9.3

Re: [dts] [PATCH V1] fix vlan filter off in invalid

[Liu, Yong]

Hi Gang,
This action is pretty weird, please also note in the code. It will be better if there's additional information like JIRA bug ID.

Thanks,
Marvin

> -----Original Message-----
> From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of xu,gang
> Sent: Tuesday, June 05, 2018 5:59 PM
> To: dts@dpdk.org
> Cc: Xu, GangX <gangx.xu@intel.com>
> Subject: [dts] [PATCH V1] fix vlan filter off in invalid
> 
> Before the dpdk commit 8b9bd0efe0b6920a08e28eebacf2bb916bdf5653
> VLAN filter and VLAN strip are enabled in testpmd by default.
> But since this commit ,they are disabled by default.
> so "vlam set filter off 0" can't be expected,
> need "vlan set filter on 0" first
> 
> Signed-off-by: xu,gang <gangx.xu@intel.com>
> ---
>  tests/TestSuite_generic_filter.py | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/tests/TestSuite_generic_filter.py
> b/tests/TestSuite_generic_filter.py
> index e69246b..cc7934b 100644
> --- a/tests/TestSuite_generic_filter.py
> +++ b/tests/TestSuite_generic_filter.py
> @@ -103,8 +103,12 @@ class TestGeneric_filter(TestCase):
>              self.dut.send_expect(
>                  "vlan set strip off %s" % valports[1], "testpmd> ")
>              self.dut.send_expect(
> +                "vlan set filter on %s" % valports[0], "testpmd> ")
> +            self.dut.send_expect(
>                  "vlan set filter off %s" % valports[0], "testpmd> ")
>              self.dut.send_expect(
> +                "vlan set filter on %s" % valports[1], "testpmd> ")
> +            self.dut.send_expect(
>                  "vlan set filter off %s" % valports[1], "testpmd> ")
> 
>          self.dut.send_expect("set flush_rx on", "testpmd> ")
> --
> 1.9.3

Re: [dts] [PATCH V1] modify unit_tests_dump keyword matching

[Liu, Yong]

Thanks, Gang. Applied.

On 06/05/2018 05:58 PM, xu,gang wrote:
> in dpdk-18.05-rc4, the dpdk prompt information change,
> the patch modify corresponding keywords
>
> Signed-off-by: xu,gang<gangx.xu@intel.com>

[dts] [PATCH V1] modify unit_tests_dump keyword matching

[xu,gang]

in dpdk-18.05-rc4, the dpdk prompt information change,
the patch modify corresponding keywords

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

diff --git a/tests/TestSuite_unit_tests_dump.py b/tests/TestSuite_unit_tests_dump.py
index f7985f2..a22afe9 100644
--- a/tests/TestSuite_unit_tests_dump.py
+++ b/tests/TestSuite_unit_tests_dump.py
@@ -127,7 +127,7 @@ class TestUnitTestsDump(TestCase):
         out = self.dut.send_expect("dump_physmem", "RTE>>", self.run_cmd_time * 2)
         self.dut.send_expect("quit", "# ")
         elements = ['Segment', 'IOVA', 'len', 'virt', 'socket_id', 'hugepage_sz', 'nchannel', 'nrank']
-        match_regex = "Segment (\d)+:"
+        match_regex = "Segment (.*?):"
         for element in elements[1:-1]:
             match_regex += " %s:(.*?)," % element
         match_regex += " %s:(.*?)" % elements[-1]
@@ -152,14 +152,13 @@ class TestUnitTestsDump(TestCase):
         out = self.dut.send_expect("dump_memzone", "testpmd>", self.run_cmd_time * 2)
         self.dut.send_expect("quit", "# ")
 
-        elements = ['Zone', 'name', 'IO', 'len', 'virt', 'socket_id', 'flags']
+        elements = ['Zone', 'name', 'len', 'virt', 'socket_id', 'flags']
         match_regex = "Zone (\d):"
         for element in elements[1:-1]:
             match_regex += " %s:(.*?)," % element
         match_regex += " %s:(.*?)\n" % elements[-1]
         m = re.compile(r"%s" % match_regex, re.DOTALL)
         results = m.findall(out)
-
         memzone_info = []
         for result in results:
             memzone_info.append(dict(zip(elements, result)))
@@ -180,6 +179,7 @@ class TestUnitTestsDump(TestCase):
             match_regex += "sizeof\(%s\) = (\d+)\r\n" % element
         match_regex += "sizeof\(%s\) = (\d+)" % elements[-1]
         m = re.compile(r"%s" % match_regex, re.S)
+        
         result = m.search(out)
         struct_info = dict(zip(elements, result.groups()))
 
-- 
1.9.3