X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_dvr.py;h=ae7864cc3e68a7e12314aeca1015531172ca3244;hb=5b82610cfa1f6d782ce53c2215fbbb2f6a5b755d;hp=07ea7878a74b9bccd1d09edd3d3e5cb0891f24c6;hpb=a5b2eec0535f9025319a752891d77ff9948ae0df;p=vpp.git

diff --git a/test/test_dvr.py b/test/test_dvr.py
index 07ea7878a74..ae7864cc3e6 100644
--- a/test/test_dvr.py
+++ b/test/test_dvr.py
@@ -2,19 +2,29 @@
 import unittest
 
 from framework import VppTestCase, VppTestRunner
-from vpp_sub_interface import VppDot1QSubint
 from vpp_ip_route import VppIpRoute, VppRoutePath
-from vpp_papi_provider import L2_VTR_OP, L2_PORT_TYPE
+from vpp_l2 import L2_PORT_TYPE
+from vpp_sub_interface import L2_VTR_OP, VppDot1QSubint
 
 from scapy.packet import Raw
 from scapy.layers.l2 import Ether, Dot1Q
 from scapy.layers.inet import IP, UDP
 from socket import AF_INET, inet_pton
 
+NUM_PKTS = 67
+
 
 class TestDVR(VppTestCase):
     """ Distributed Virtual Router """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestDVR, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestDVR, cls).tearDownClass()
+
     def setUp(self):
         super(TestDVR, self).setUp()
 
@@ -117,7 +127,7 @@ class TestDVR(VppTestCase):
         # Inject the packet that arrives and leaves on a non-tagged interface
         # Since it's 'bridged' expect that the MAC headed is unchanged.
         #
-        rx = self.send_and_expect(self.pg0, pkt_no_tag * 65, self.pg1)
+        rx = self.send_and_expect(self.pg0, pkt_no_tag * NUM_PKTS, self.pg1)
         self.assert_same_mac_addr(pkt_no_tag, rx)
         self.assert_has_no_tag(rx)
 
@@ -135,7 +145,7 @@ class TestDVR(VppTestCase):
         # Inject the packet that arrives non-tag and leaves on a tagged
         # interface
         #
-        rx = self.send_and_expect(self.pg0, pkt_tag * 65, self.pg3)
+        rx = self.send_and_expect(self.pg0, pkt_tag * NUM_PKTS, self.pg3)
         self.assert_same_mac_addr(pkt_tag, rx)
         self.assert_has_vlan_tag(93, rx)
 
@@ -150,7 +160,9 @@ class TestDVR(VppTestCase):
                           UDP(sport=1234, dport=1234) /
                           Raw('\xa5' * 100))
 
-        rx = self.send_and_expect(self.pg2, pkt_tag_to_tag * 65, self.pg3)
+        rx = self.send_and_expect(self.pg2,
+                                  pkt_tag_to_tag * NUM_PKTS,
+                                  self.pg3)
         self.assert_same_mac_addr(pkt_tag_to_tag, rx)
         self.assert_has_vlan_tag(93, rx)
 
@@ -165,7 +177,9 @@ class TestDVR(VppTestCase):
                               UDP(sport=1234, dport=1234) /
                               Raw('\xa5' * 100))
 
-        rx = self.send_and_expect(self.pg2, pkt_tag_to_non_tag * 65, self.pg1)
+        rx = self.send_and_expect(self.pg2,
+                                  pkt_tag_to_non_tag * NUM_PKTS,
+                                  self.pg1)
         self.assert_same_mac_addr(pkt_tag_to_tag, rx)
         self.assert_has_no_tag(rx)
 
@@ -196,7 +210,8 @@ class TestDVR(VppTestCase):
         #
         # Send packet's that should match the ACL and be dropped
         #
-        rx = self.send_and_assert_no_replies(self.pg2, pkt_tag_to_non_tag * 65)
+        rx = self.send_and_assert_no_replies(self.pg2,
+                                             pkt_tag_to_non_tag * NUM_PKTS)
 
         #
         # cleanup
@@ -308,7 +323,7 @@ class TestDVR(VppTestCase):
             push_dot1q=93)
 
         #
-        # Disable UU flooding, learning and ARP terminaation. makes this test
+        # Disable UU flooding, learning and ARP termination. makes this test
         # easier as unicast packets are dropped if not extracted.
         #
         self.vapi.bridge_flags(bd_id=1, is_set=0,
@@ -344,19 +359,21 @@ class TestDVR(VppTestCase):
         #
         # now we expect the packet forward according to the DVR route
         #
-        rx = self.send_and_expect(self.pg0, pkt_no_tag * 65, self.pg1)
+        rx = self.send_and_expect(self.pg0, pkt_no_tag * NUM_PKTS, self.pg1)
         self.assert_same_mac_addr(pkt_no_tag, rx)
         self.assert_has_no_tag(rx)
 
-        rx = self.send_and_expect(self.pg0, pkt_to_tag * 65, self.pg2)
+        rx = self.send_and_expect(self.pg0, pkt_to_tag * NUM_PKTS, self.pg2)
         self.assert_same_mac_addr(pkt_to_tag, rx)
         self.assert_has_vlan_tag(92, rx)
 
-        rx = self.send_and_expect(self.pg3, pkt_from_tag * 65, self.pg1)
+        rx = self.send_and_expect(self.pg3, pkt_from_tag * NUM_PKTS, self.pg1)
         self.assert_same_mac_addr(pkt_from_tag, rx)
         self.assert_has_no_tag(rx)
 
-        rx = self.send_and_expect(self.pg3, pkt_from_to_tag * 65, self.pg2)
+        rx = self.send_and_expect(self.pg3,
+                                  pkt_from_to_tag * NUM_PKTS,
+                                  self.pg2)
         self.assert_same_mac_addr(pkt_from_tag, rx)
         self.assert_has_vlan_tag(92, rx)