[dts] [PATCH] tests: fix dot1q layer not found

[dts] [PATCH] tests: fix dot1q layer not found

[Marvin Liu]

Packet module changed layer name from "dot1q" to "vlan", testsuites
which handle packet by this module should be changed correspondingly.

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

diff --git a/tests/TestSuite_userspace_ethtool.py b/tests/TestSuite_userspace_ethtool.py
index c23f841..c718a58 100644
--- a/tests/TestSuite_userspace_ethtool.py
+++ b/tests/TestSuite_userspace_ethtool.py
@@ -340,7 +340,7 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
 
             # send correct vlan packet to port
             pkt = Packet(pkt_type='VLAN_UDP')
-            pkt.config_layer('dot1q', {'vlan': vlan})
+            pkt.config_layer('vlan', {'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 +350,7 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
 
             # send incorrect vlan packet to port
             wrong_vlan = (vlan + 1) % 4096
-            pkt.config_layer('dot1q', {'vlan': wrong_vlan})
+            pkt.config_layer('vlan', {'vlan': wrong_vlan})
             pkt.send_pkt(tx_port=intf)
             time.sleep(2)
             rx_pkts_wrong, _ = self.strip_portstats(port)
@@ -359,7 +359,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('dot1q', {'vlan': vlan})
+            pkt.config_layer('vlan', {'vlan': vlan})
             pkt.send_pkt(tx_port=intf)
             time.sleep(2)
             rx_pkts_del, _ = self.strip_portstats(port)
diff --git a/tests/TestSuite_vlan.py b/tests/TestSuite_vlan.py
index bf20455..70a9813 100644
--- a/tests/TestSuite_vlan.py
+++ b/tests/TestSuite_vlan.py
@@ -90,7 +90,7 @@ class TestVlan(TestCase):
         pkts = load_sniff_packets(self.inst)
         vlans = []
         for packet in pkts:
-            vlan = packet.strip_element_dot1q("vlan")
+            vlan = packet.strip_element_vlan("vlan")
             vlans.append(vlan)
         return vlans
 
@@ -117,7 +117,7 @@ class TestVlan(TestCase):
         else:
             pkt = Packet(pkt_type='VLAN_UDP')
             pkt.config_layer('ether', {'dst': self.dmac, 'src': self.smac})
-            pkt.config_layer('dot1q', {'vlan': vid})
+            pkt.config_layer('vlan', {'vlan': vid})
 
         pkt.send_pkt(tx_port=self.txItf)
 
-- 
1.9.3