[dts] [PATCH V1]Ethtool: update automation testing script

[Yufen Mo]

From: yufengmx <yufengx.mo at intel.com>

*. sync vlan definition as framework/packet module
*. close eeprom test case on FVL for FVL series firmware not supported
*. set port to up status when port is on down status
*. reset ring parameter after ring parameter is used
*. set packet src mac with a non-zero value
*. set testing content the same user space ethtool dumped

Signed-off-by: yufengmx <yufengx.mo at intel.com>
---
 tests/TestSuite_userspace_ethtool.py | 41 +++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/tests/TestSuite_userspace_ethtool.py b/tests/TestSuite_userspace_ethtool.py
index c718a58..6917150 100644
--- a/tests/TestSuite_userspace_ethtool.py
+++ b/tests/TestSuite_userspace_ethtool.py
@@ -34,6 +34,7 @@ DPDK Test suite.
 Test support of userspace ethtool feature
 """
 
+import os
 import dts
 import time
 import re
@@ -67,6 +68,7 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
         self.pause_time = 65535
         self.frame_size = 64
         self.pause_rate = 0.50
+        self.src_mac = "11:22:33:44:55:66"
 
         # update IxiaPacketGenerator function from local
         self.tester.extend_external_packet_generator(TestUserspaceEthtool, self)
@@ -128,8 +130,8 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
             return 1518
 
     def resize_linux_eeprom_file(self, dpdk_eeprom_file, linux_eeprom_file):
-        basePath = self.dut.base_dir
-        with open( basePath + dpdk_eeprom_file, 'rb') as fpDpdk:
+        basePath = os.sep + "root" + self.dut.base_dir[1:] + os.sep
+        with open( basePath + os.sep + dpdk_eeprom_file, 'rb') as fpDpdk:
             dpdk_bytes = fpDpdk.read()
             dpdk_length = len(dpdk_bytes)
 
@@ -152,6 +154,13 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
         else:
             return ""
 
+    def check_port_up(self, intf):
+        self.tester.send_expect("ifconfig %s | grep -i up"%intf, "#")
+        if self.tester.send_expect("echo $?", "#") != "0":
+            self.tester.send_expect("ifconfig %s up"%intf, "#")
+            time.sleep(1)
+            self.verify( self.tester.send_expect("echo $?", "#") == "0", "Tester [%s] boot up failed"%intf)
+
     def test_dump_driver_info(self):
         """
         Test ethtool can dump basic information
@@ -200,10 +209,12 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
             time.sleep(5)
 
         # check port stats function
-        pkt = Packet(pkt_type='UDP')
+        pkt = Packet()
+        pkt.config_layer('ether', {'src': self.src_mac})
         for port in self.ports:
             tester_port = self.tester.get_local_port(port)
             intf = self.tester.get_interface(tester_port)
+            self.check_port_up(intf)
             ori_rx_pkts, ori_tx_pkts = self.strip_portstats(port)
             pkt.send_pkt(tx_port=intf)
             time.sleep(1)
@@ -220,7 +231,10 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
 
         portsinfo = []
         ori_drivers = []
-
+        
+        if self.nic.startswith("fortville"):
+            return
+        
         for portid in range(len(self.ports)):
             self.dut.send_expect("regs %d regs_%d.bin" % (portid, portid), "EthApp>")
             portinfo = {'portid': portid, 'reg_file': 'regs_%d.bin' % portid}
@@ -300,8 +314,8 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
         """
         Test ethtool app ring parameter getting and setting
         """
-        self.dut.send_expect(self.cmd, "EthApp>", 60)
         for index in range(len(self.ports)):
+            self.dut.send_expect(self.cmd, "EthApp>", 60)
             port = self.ports[index]
             ori_rx_pkts, ori_tx_pkts = self.strip_portstats(port)
             _, rx_max, _, tx_max = self.strip_ringparam(index)
@@ -310,13 +324,15 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
             self.verify(rx_ring == rx_max, "Userspace tool failed to set Rx ring parameter")
             self.verify(tx_ring == tx_max, "Userspace tool failed to set Tx ring parameter")
             pkt = Packet()
+            pkt.config_layer('ether', {'src': self.src_mac})
             tester_port = self.tester.get_local_port(port)
             intf = self.tester.get_interface(tester_port)
+            self.check_port_up(intf)
             pkt.send_pkt(tx_port=intf)
+            time.sleep(1) 
             rx_pkts, tx_pkts = self.strip_portstats(index)
             self.verify(rx_pkts == ori_rx_pkts + 1, "Failed to forward after ring parameter changed")
-
-        self.dut.send_expect("quit", "# ")
+            self.dut.send_expect("quit", "# ")
 
     def test_ethtool_vlan(self):
         """
@@ -340,7 +356,8 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
 
             # send correct vlan packet to port
             pkt = Packet(pkt_type='VLAN_UDP')
-            pkt.config_layer('vlan', {'vlan': vlan})
+            pkt.config_layer('ether', {'src': self.src_mac})
+            pkt.config_layer('dot1q', {'vlan': vlan})
             tester_port = self.tester.get_local_port(port)
             intf = self.tester.get_interface(tester_port)
             pkt.send_pkt(tx_port=intf)
@@ -350,7 +367,7 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
 
             # send incorrect vlan packet to port
             wrong_vlan = (vlan + 1) % 4096
-            pkt.config_layer('vlan', {'vlan': wrong_vlan})
+            pkt.config_layer('dot1q', {'vlan': wrong_vlan})
             pkt.send_pkt(tx_port=intf)
             time.sleep(2)
             rx_pkts_wrong, _ = self.strip_portstats(port)
@@ -359,7 +376,7 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
             # remove vlan
             self.dut.send_expect("vlan %d del %d" % (index, vlan), "EthApp>")
             # send same packet and make sure not received
-            pkt.config_layer('vlan', {'vlan': vlan})
+            pkt.config_layer('dot1q', {'vlan': vlan})
             pkt.send_pkt(tx_port=intf)
             time.sleep(2)
             rx_pkts_del, _ = self.strip_portstats(port)
@@ -386,6 +403,7 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
             self.verify(dump_mac == valid_mac, "Userspace tool failed to set mac")
             # check forwarded mac has been changed
             pkt = Packet()
+            pkt.config_layer('ether', {'src': self.src_mac})
             tester_port = self.tester.get_local_port(port)
             intf = self.tester.get_interface(tester_port)
             # send and sniff packet
@@ -419,6 +437,7 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
             self.dut.send_expect("stop %d" % index, "EthApp>")
             # check packet not forwarded when port is stop
             pkt = Packet()
+            pkt.config_layer('ether', {'src': self.src_mac})
             tester_port = self.tester.get_local_port(port)
             intf = self.tester.get_interface(tester_port)
             pkt.send_pkt(tx_port=intf)
@@ -455,10 +474,12 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
                 ori_rx_pkts, _ = self.strip_portstats(index)
                 pkt_size = mtu + HEADER_SIZE['eth']
                 pkt = Packet(pkt_len=pkt_size)
+                pkt.config_layer('ether', {'src': self.src_mac})
                 pkt.send_pkt(tx_port=intf)
                 rx_pkts, _ = self.strip_portstats(index)
                 self.verify(rx_pkts == ori_rx_pkts, "Packet match mtu not forwarded as expected")
                 pkt = Packet(pkt_len=mtu + 1)
+                pkt.config_layer('ether', {'src': self.src_mac})
                 pkt.send_pkt(tx_port=intf)
                 rx_pkts_over, _ = self.strip_portstats(index)
                 self.verify(rx_pkts == rx_pkts_over, "Packet over mtu should not be forwarded")
-- 
1.9.3