test suite reviews and discussions
 help / color / mirror / Atom feed
From: Yong Liu <yong.liu@intel.com>
To: dts@dpdk.org
Subject: [dts] [PATCH 6/6] tests: support Boulder Rapid
Date: Wed,  3 Feb 2016 14:50:17 +0800	[thread overview]
Message-ID: <1454482217-25147-7-git-send-email-yong.liu@intel.com> (raw)
In-Reply-To: <1454482217-25147-1-git-send-email-yong.liu@intel.com>

Signed-off-by: Marvin Liu <yong.liu@intel.com>

diff --git a/tests/TestSuite_checksum_offload.py b/tests/TestSuite_checksum_offload.py
index a1f3280..7dc8ddc 100644
--- a/tests/TestSuite_checksum_offload.py
+++ b/tests/TestSuite_checksum_offload.py
@@ -169,7 +169,7 @@ class TestChecksumOffload(TestCase):
                     'IPv6/UDP': 'Ether(dst="02:00:00:00:00:00", src="%s")/Dot1Q(vlan=1)/IPv6(src="::2")/UDP()/("X"*46)' % mac,
                     'IPv6/TCP': 'Ether(dst="02:00:00:00:00:00", src="%s")/Dot1Q(vlan=1)/IPv6(src="::2")/TCP()/("X"*46)' % mac}
 
-        if self.nic in ['redrockcanyou', 'atwood']:
+        if self.kdriver == "fm10k":
             del pktsChkErr['IP/SCTP']
             del pkts['IP/SCTP']
 
@@ -200,7 +200,7 @@ class TestChecksumOffload(TestCase):
                     'IPv6/UDP': 'Ether(dst="02:00:00:00:00:00", src="%s")/IPv6(src="::2")/UDP()/("X"*46)' % mac,
                     'IPv6/TCP': 'Ether(dst="02:00:00:00:00:00", src="%s")/IPv6(src="::2")/TCP()/("X"*46)' % mac}
 
-        if self.nic in ['redrockcanyou', 'atwood']:
+        if self.kdriver == "fm10k":
             del pkts['IP/SCTP']
             del pkts_ref['IP/SCTP']
 
@@ -289,7 +289,7 @@ class TestChecksumOffload(TestCase):
                 'IPv6/UDP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6()/UDP()/("X"* (lambda x: x - 66 if x > 66 else 0)(%d))',
                 'IPv6/TCP': 'Ether(dst="%s", src="52:00:00:00:00:00")/IPv6()/TCP()/("X"* (lambda x: x - 78 if x > 78 else 0)(%d))'}
 
-        if self.nic in ['redrockcanyou', 'atwood']:
+        if self.kdriver == "fm10k":
             del pkts['IP/SCTP']
 
         lcore = "1S/2C/1T"
diff --git a/tests/TestSuite_jumboframes.py b/tests/TestSuite_jumboframes.py
index 813ed9d..95b2540 100644
--- a/tests/TestSuite_jumboframes.py
+++ b/tests/TestSuite_jumboframes.py
@@ -119,7 +119,7 @@ class TestJumboframes(TestCase):
 
         self.port_mask = dts.create_mask([self.rx_port, self.tx_port])
 
-        if self.nic in ["redrockcanyou", "atwood"]:
+        if self.kdriver == "fm10k":
             netobj = self.dut.ports_info[self.tx_port]['port']
             netobj.enable_jumbo(framesize = ETHER_JUMBO_FRAME_MTU)
             netobj = self.dut.ports_info[self.rx_port]['port']
@@ -157,7 +157,7 @@ class TestJumboframes(TestCase):
         jumbo frame support.
         """
         # RRC has no ability to set the max pkt len to hardware
-        if self.nic in ["redrockcanyou", "atwood"]:
+        if self.kdriver == "fm10k":
             print dts.RED("fm10k not support this case\n")
             return
         self.pmdout.start_testpmd("Default", "--max-pkt-len=%d --port-topology=loop" % (ETHER_STANDARD_MTU))
diff --git a/tests/TestSuite_pmdrssreta.py b/tests/TestSuite_pmdrssreta.py
index 5c62c72..9a0ad2f 100644
--- a/tests/TestSuite_pmdrssreta.py
+++ b/tests/TestSuite_pmdrssreta.py
@@ -148,7 +148,7 @@ class TestPmdrssreta(TestCase):
         i = 0
         for tmp_reta_line in reta_lines:
             status = "false"
-            if(self.nic in ["niantic", "redrockcanyou"]):
+            if(self.nic in ["niantic", "redrockcanyou", "atwood", "boulderrapid"]):
                 # compute the hash result of five tuple into the 7 LSBs value.
                 hash_index = int(tmp_reta_line["RSS hash"], 16) % 128
             else:
@@ -212,7 +212,7 @@ class TestPmdrssreta(TestCase):
                     "set nbcore %d" % (queue + 1), "testpmd> ")
 
                 # configure the reta with specific mappings.
-                if(self.nic in ["niantic", "redrockcanyou"]):
+                if(self.nic in ["niantic", "redrockcanyou", "atwood", "boulderrapid"]):
                     for i in range(128):
                         reta_entries.insert(i, random.randint(0, queue - 1))
                         self.dut.send_expect(
@@ -228,7 +228,7 @@ class TestPmdrssreta(TestCase):
             self.dut.send_expect("quit", "# ", 30)
 
     def test_rss_key_size(self):
-        nic_rss_key_size = {"fortville_eagle": 52, "fortville_spirit": 52, "fortville_spirit_single": 52, "niantic": 40, "e1000": 40, "redrockcanyou":40}
+        nic_rss_key_size = {"fortville_eagle": 52, "fortville_spirit": 52, "fortville_spirit_single": 52, "niantic": 40, "e1000": 40, "redrockcanyou": 40, "atwood": 40,  "boulderrapid": 40}
         self.verify(self.nic in nic_rss_key_size.keys(), "Not supporte rss key on %s" % self.nic)
 
         dutPorts = self.dut.get_ports(self.nic)
diff --git a/tests/TestSuite_scatter.py b/tests/TestSuite_scatter.py
index c8b86fa..44a55b6 100644
--- a/tests/TestSuite_scatter.py
+++ b/tests/TestSuite_scatter.py
@@ -66,13 +66,13 @@ class TestScatter(TestCase):
         self.pmdout = PmdOutput(self.dut)
         if self.nic in ["niantic", "sageville", "fortpark", "fortville_eagle",
                         "fortville_spirit", "fortville_spirit_single",
-                        "redrockcanyou", "atwood",
+                        "redrockcanyou", "atwood", "boulderrapid",
                         "ironpond", "twinpond", "springfountain"]:
             self.mbsize = 2048
         else:
             self.mbsize = 1024
 
-        if self.nic in ['redrockcanyou', 'atwood']:
+        if self.kdriver == "fm10k":
             self.dut.ports_info[self.port]['port'].enable_jumbo(framesize=9000)
 
         self.tester.send_expect("ifconfig %s mtu 9000" % self.intf, "#")
@@ -131,7 +131,7 @@ class TestScatter(TestCase):
         """
         Run after each test suite.
         """
-        if self.nic in ['redrockcanyou', 'atwood']:
+        if self.kdriver == "fm10k":
             self.dut.ports_info[self.port]['port'].enable_jumbo(framesize=1518)
         self.tester.send_expect("ifconfig %s mtu 1500" % self.intf, "#")
         pass
diff --git a/tests/TestSuite_shutdown_api.py b/tests/TestSuite_shutdown_api.py
index eea7b8e..f03734a 100644
--- a/tests/TestSuite_shutdown_api.py
+++ b/tests/TestSuite_shutdown_api.py
@@ -133,7 +133,7 @@ class TestShutdownApi(TestCase):
         rx_bytes_exp = pktSize
         tx_bytes_exp = pktSize
 
-        if self.nic in ['redrockcanyou', 'atwood']:
+        if self.kdriver == "fm10k":
             # RRC will always strip rx/tx crc
             rx_bytes_exp -= 4
             tx_bytes_exp -= 4
@@ -162,7 +162,7 @@ class TestShutdownApi(TestCase):
         Check link status of the ports.
         """
         # RRC not support link speed change
-        if self.nic in ['redrockcanyou', 'atwood']:
+        if self.kdriver == "fm10k":
             return
 
         for port in self.ports:
@@ -275,7 +275,7 @@ class TestShutdownApi(TestCase):
         """
         Change Link Speed.
         """
-        if self.nic in ["redrockcanyou", "atwood"]:
+        if self.kdriver == "fm10k":
             print dts.RED("RRC not support\n")
             return
 
@@ -321,7 +321,7 @@ class TestShutdownApi(TestCase):
         """
         Enable/Disable Jumbo Frames.
         """
-        if self.nic in ["redrockcanyou", "atwood"]:
+        if self.kdriver == "fm10k":
             print dts.RED("RRC not support\n")
             return
 
@@ -484,7 +484,7 @@ class TestShutdownApi(TestCase):
         """
         port link stats test
         """
-        if self.nic in ["redrockcanyou", "atwood"]:
+        if self.kdriver == "fm10k":
             print dts.RED("RRC not support\n")
             return
 
diff --git a/tests/TestSuite_tso.py b/tests/TestSuite_tso.py
index 65b30b7..142e0d1 100644
--- a/tests/TestSuite_tso.py
+++ b/tests/TestSuite_tso.py
@@ -84,7 +84,7 @@ class TestTSO(TestCase):
         self.verify(self.nic in ["kawela_2", "niantic", "bartonhills", "82545EM",
                                  "82540EM", "springfountain", "fortville_eagle",
                                  "fortville_spirit", "fortville_spirit_single",
-                                 "redrockcanyou"],
+                                 "redrockcanyou", "atwood", "boulderrapid"],
                     "NIC Unsupported: " + str(self.nic))
 
         # Based on h/w type, choose how many ports to use
diff --git a/tests/TestSuite_vf_rss.py b/tests/TestSuite_vf_rss.py
index 8695f8f..9b6ee6f 100644
--- a/tests/TestSuite_vf_rss.py
+++ b/tests/TestSuite_vf_rss.py
@@ -188,7 +188,7 @@ class TestVfRss(TestCase):
         i = 0
         for tmp_reta_line in reta_lines:
             status = "false"
-            if(self.nic in ["niantic", "redrockcanyou"]):
+            if self.kdriver == "fm10k":
                 # compute the hash result of five tuple into the 7 LSBs value.
                 hash_index = int(tmp_reta_line["RSS hash"], 16) % 128
             else:
@@ -313,7 +313,7 @@ class TestVfRss(TestCase):
                     "set nbcore %d" % (queue + 1), "testpmd> ")
 
                 # configure the reta with specific mappings.
-                if(self.nic in ["niantic", "redrockcanyou"]):
+                if(self.nic in ["niantic", "redrockcanyou", "atwood", "boulderrapid"]):
                     for i in range(128):
                         reta_entries.insert(i, random.randint(0, queue - 1))
                         self.vm_dut_0.send_expect(
diff --git a/tests/TestSuite_vlan.py b/tests/TestSuite_vlan.py
index b32a0f8..ba3741e 100644
--- a/tests/TestSuite_vlan.py
+++ b/tests/TestSuite_vlan.py
@@ -75,14 +75,14 @@ class TestVlan(TestCase):
         self.dut.send_expect("set verbose 1", "testpmd> ")
         out = self.dut.send_expect("set fwd mac", "testpmd> ")
 
-        if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single", "redrockcanyou"]:
+        if self.nic in ["fortville_eagle", "fortville_spirit", "fortville_spirit_single"]:
             self.dut.send_expect("vlan set filter on %s" % dutRxPortId, "testpmd> ")
 
         self.dut.send_expect("vlan set strip off %s" % dutRxPortId, "testpmd> ")
         self.verify('Set mac packet forwarding mode' in out, "set fwd rxonly error")
         self.vlan = 51
 
-        if self.nic in ["redrockcanyou", "atwood"]:
+        if self.kdriver == "fm10k":
             netobj = self.dut.ports_info[dutRxPortId]['port']
             netobj.add_vlan(vlan_id = self.vlan)
 
@@ -132,7 +132,7 @@ class TestVlan(TestCase):
         Enable receipt of VLAN packets
         """
 
-        if self.nic in ["redrockcanyou", "atwood"]:
+        if self.kdriver == "fm10k":
             print dts.RED("fm10k not support this case\n")
             return
         self.dut.send_expect("rx_vlan add %d %s" % (self.vlan, dutRxPortId), "testpmd> ")
@@ -177,7 +177,7 @@ class TestVlan(TestCase):
 
     def test_vlan_strip_config_off(self):
 
-        if self.nic in ["redrockcanyou", "atwood"]:
+        if self.kdriver == "fm10k":
             print dts.RED("fm10k not support this case\n")
             return
         self.dut.send_expect("vlan set strip off %s" % dutRxPortId, "testpmd> ", 20)
@@ -195,7 +195,7 @@ class TestVlan(TestCase):
         """
         Enable VLAN header insertion in transmitted packets
         """
-        if self.nic in ["redrockcanyou", "atwood"]:
+        if self.kdriver == "fm10k":
             netobj = self.dut.ports_info[dutTxPortId]['port']
             netobj.add_vlan(vlan_id = self.vlan)
             netobj.add_txvlan(vlan_id = self.vlan)
@@ -214,7 +214,7 @@ class TestVlan(TestCase):
         self.dut.send_expect("tx_vlan reset %s" % dutTxPortId, "testpmd> ", 30)
         self.dut.send_expect("stop", "testpmd> ", 30)
 
-        if self.nic in ["redrockcanyou", "atwood"]:
+        if self.kdriver == "fm10k":
             netobj = self.dut.ports_info[dutTxPortId]['port']
             # not delete vlan for self.vlan will used later
             netobj.delete_txvlan(vlan_id = self.vlan)
@@ -230,7 +230,7 @@ class TestVlan(TestCase):
         Run after each test suite.
         """
         self.dut.kill_all()
-        if self.nic in ["redrockcanyou", "atwood"]:
+        if self.kdriver == "fm10k":
             netobj = self.dut.ports_info[dutRxPortId]['port']
             netobj.delete_txvlan(vlan_id = self.vlan)
             netobj.delete_vlan(vlan_id = self.vlan)
-- 
1.9.3

      parent reply	other threads:[~2016-02-03  6:50 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-03  6:50 [dts] [PATCH 0/6] Support " Yong Liu
2016-02-03  6:50 ` [dts] [PATCH 1/6] nics fm10k: rename fm10k module to rrc Yong Liu
2016-02-03  6:50 ` [dts] [PATCH 2/6] framework settings: support boulderrapid nic Yong Liu
2016-02-03  6:50 ` [dts] [PATCH 3/6] framework test_case: add kernel driver variable Yong Liu
2016-02-03  6:50 ` [dts] [PATCH 4/6] nics: add support for Boulder Rapid Yong Liu
2016-02-03  6:50 ` [dts] [PATCH 5/6] nics net_device: support Boulder Rapid network object Yong Liu
2016-02-03  6:50 ` Yong Liu [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=1454482217-25147-7-git-send-email-yong.liu@intel.com \
    --to=yong.liu@intel.com \
    --cc=dts@dpdk.org \
    /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).