[dts] [PATCH] fix shutdown api 1G nics bug

[dts] [PATCH] fix shutdown api 1G nics bug

[yongjie]

From: root <root@linux-9riq.site>

Signed-off-by: root <root@linux-9riq.site>
---
 tests/TestSuite_shutdown_api.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/TestSuite_shutdown_api.py b/tests/TestSuite_shutdown_api.py
index d672d50..2202ae1 100644
--- a/tests/TestSuite_shutdown_api.py
+++ b/tests/TestSuite_shutdown_api.py
@@ -147,8 +147,7 @@ class TestShutdownApi(TestCase):
                 rx_bytes_exp -= 4
                 tx_bytes_exp -= 4
         elif self.nic in ["fortville_eagle", "fortville_spirit",
-                        "fortville_spirit_single", "bartonhills",
-                        "powerville", "springville", "hartwell"]:
+                        "fortville_spirit_single", "bartonhills"]:
             # some NIC will always strip tx crc
             tx_bytes_exp -= 4
             if vlan is True:
@@ -156,7 +155,7 @@ class TestShutdownApi(TestCase):
                 tx_bytes_exp -= 4
         else:
             # some NIC will always include tx crc
-            if crcStrip is True:
+            if crcStrip is True and self.nic not in ["springville", "powerville"]:
                 rx_bytes_exp -= 4
             if vlan is True:
                 # vlan strip default is on
@@ -354,7 +353,7 @@ class TestShutdownApi(TestCase):
         self.dut.send_expect("port start all", "testpmd> ", 100)
         self.dut.send_expect("start", "testpmd> ")
 
-        if self.nic in ['niantic']:
+        if self.nic in ['niantic', 'twinpond', 'kawela_4', 'ironpond', 'springfountain', 'springville', 'powerville']:
             # nantic vlan length will not be calculated
             vlan_jumbo_size = jumbo_size + 4
         else:
-- 
1.8.5.2

Re: [dts] [PATCH] fix shutdown api 1G nics bug

[Liu, Yong]

Hi Yongjie,
Thanks, and one comment below.

On 11/11/2015 04:39 PM, yongjie wrote:
> From: root <root@linux-9riq.site>
>
> Signed-off-by: root <root@linux-9riq.site>
> ---
>   tests/TestSuite_shutdown_api.py | 7 +++----
>   1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/tests/TestSuite_shutdown_api.py b/tests/TestSuite_shutdown_api.py
> index d672d50..2202ae1 100644
> --- a/tests/TestSuite_shutdown_api.py
> +++ b/tests/TestSuite_shutdown_api.py
> @@ -147,8 +147,7 @@ class TestShutdownApi(TestCase):
>                   rx_bytes_exp -= 4
>                   tx_bytes_exp -= 4
>           elif self.nic in ["fortville_eagle", "fortville_spirit",
> -                        "fortville_spirit_single", "bartonhills",
> -                        "powerville", "springville", "hartwell"]:
> +                        "fortville_spirit_single", "bartonhills"]:
>               # some NIC will always strip tx crc
>               tx_bytes_exp -= 4
>               if vlan is True:
> @@ -156,7 +155,7 @@ class TestShutdownApi(TestCase):
>                   tx_bytes_exp -= 4
>           else:
>               # some NIC will always include tx crc
> -            if crcStrip is True:
> +            if crcStrip is True and self.nic not in ["springville", "powerville"]:
This condition is for default nic like niantic. If "powerville" and 
"sprintville" not act like this, please add whole new condition.

>                   rx_bytes_exp -= 4
>               if vlan is True:
>                   # vlan strip default is on
> @@ -354,7 +353,7 @@ class TestShutdownApi(TestCase):
>           self.dut.send_expect("port start all", "testpmd> ", 100)
>           self.dut.send_expect("start", "testpmd> ")
>   
> -        if self.nic in ['niantic']:
> +        if self.nic in ['niantic', 'twinpond', 'kawela_4', 'ironpond', 'springfountain', 'springville', 'powerville']:
>               # nantic vlan length will not be calculated
>               vlan_jumbo_size = jumbo_size + 4
>           else: