X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_dvr.py;h=f6ce8e80720dcfa8d81deab8a14934cce50c8df2;hb=dd1e3e780;hp=9d8675832eaf68e4d81652e6d26f418d8ca5ab3e;hpb=d5c60b96a3fd93916fc4af5c8d6d25625c28242e;p=vpp.git

diff --git a/test/test_dvr.py b/test/test_dvr.py
index 9d8675832ea..f6ce8e80720 100644
--- a/test/test_dvr.py
+++ b/test/test_dvr.py
@@ -2,9 +2,9 @@
 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
+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
@@ -15,6 +15,14 @@ from socket import AF_INET, inet_pton
 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()
 
@@ -84,18 +92,24 @@ class TestDVR(VppTestCase):
         #
         # Put all the interfaces into a new bridge domain
         #
-        self.vapi.sw_interface_set_l2_bridge(self.pg0.sw_if_index, 1)
-        self.vapi.sw_interface_set_l2_bridge(self.pg1.sw_if_index, 1)
-        self.vapi.sw_interface_set_l2_bridge(sub_if_on_pg2.sw_if_index, 1)
-        self.vapi.sw_interface_set_l2_bridge(sub_if_on_pg3.sw_if_index, 1)
-        self.vapi.sw_interface_set_l2_bridge(self.loop0.sw_if_index, 1, bvi=1)
-
-        self.vapi.sw_interface_set_l2_tag_rewrite(sub_if_on_pg2.sw_if_index,
-                                                  L2_VTR_OP.L2_POP_1,
-                                                  92)
-        self.vapi.sw_interface_set_l2_tag_rewrite(sub_if_on_pg3.sw_if_index,
-                                                  L2_VTR_OP.L2_POP_1,
-                                                  93)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=self.pg0.sw_if_index, bd_id=1)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=self.pg1.sw_if_index, bd_id=1)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=sub_if_on_pg2.sw_if_index, bd_id=1)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=sub_if_on_pg3.sw_if_index, bd_id=1)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=self.loop0.sw_if_index, bd_id=1,
+            port_type=L2_PORT_TYPE.BVI)
+
+        self.vapi.l2_interface_vlan_tag_rewrite(
+            sw_if_index=sub_if_on_pg2.sw_if_index, vtr_op=L2_VTR_OP.L2_POP_1,
+            push_dot1q=92)
+        self.vapi.l2_interface_vlan_tag_rewrite(
+            sw_if_index=sub_if_on_pg3.sw_if_index, vtr_op=L2_VTR_OP.L2_POP_1,
+            push_dot1q=93)
 
         #
         # Add routes to bridge the traffic via a tagged an nontagged interface
@@ -199,16 +213,17 @@ class TestDVR(VppTestCase):
                                              0, [])
         self.vapi.acl_del(acl.acl_index)
 
-        self.vapi.sw_interface_set_l2_bridge(self.pg0.sw_if_index, 1,
-                                             enable=0)
-        self.vapi.sw_interface_set_l2_bridge(self.pg1.sw_if_index, 1,
-                                             enable=0)
-        self.vapi.sw_interface_set_l2_bridge(sub_if_on_pg2.sw_if_index,
-                                             1, enable=0)
-        self.vapi.sw_interface_set_l2_bridge(sub_if_on_pg3.sw_if_index,
-                                             1, enable=0)
-        self.vapi.sw_interface_set_l2_bridge(self.loop0.sw_if_index,
-                                             1, bvi=1, enable=0)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=self.pg0.sw_if_index, bd_id=1, enable=0)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=self.pg1.sw_if_index, bd_id=1, enable=0)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=sub_if_on_pg2.sw_if_index, bd_id=1, enable=0)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=sub_if_on_pg3.sw_if_index, bd_id=1, enable=0)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=self.loop0.sw_if_index, bd_id=1,
+            port_type=L2_PORT_TYPE.BVI, enable=0)
 
         #
         # Do a FIB dump to make sure the paths are correctly reported as DVR
@@ -285,22 +300,27 @@ class TestDVR(VppTestCase):
         #
         # Put all the interfaces into a new bridge domain
         #
-        self.vapi.sw_interface_set_l2_bridge(self.pg0.sw_if_index, 1)
-        self.vapi.sw_interface_set_l2_bridge(self.pg1.sw_if_index, 1)
-        self.vapi.sw_interface_set_l2_bridge(sub_if_on_pg2.sw_if_index, 1)
-        self.vapi.sw_interface_set_l2_bridge(sub_if_on_pg3.sw_if_index, 1)
-        self.vapi.sw_interface_set_l2_tag_rewrite(sub_if_on_pg2.sw_if_index,
-                                                  L2_VTR_OP.L2_POP_1,
-                                                  92)
-        self.vapi.sw_interface_set_l2_tag_rewrite(sub_if_on_pg3.sw_if_index,
-                                                  L2_VTR_OP.L2_POP_1,
-                                                  93)
-
-        #
-        # Disable UU flooding, learning and ARP terminaation. makes this test
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=self.pg0.sw_if_index, bd_id=1)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=self.pg1.sw_if_index, bd_id=1)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=sub_if_on_pg2.sw_if_index, bd_id=1)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=sub_if_on_pg3.sw_if_index, bd_id=1)
+        self.vapi.l2_interface_vlan_tag_rewrite(
+            sw_if_index=sub_if_on_pg2.sw_if_index, vtr_op=L2_VTR_OP.L2_POP_1,
+            push_dot1q=92)
+        self.vapi.l2_interface_vlan_tag_rewrite(
+            sw_if_index=sub_if_on_pg3.sw_if_index, vtr_op=L2_VTR_OP.L2_POP_1,
+            push_dot1q=93)
+
+        #
+        # Disable UU flooding, learning and ARP termination. makes this test
         # easier as unicast packets are dropped if not extracted.
         #
-        self.vapi.bridge_flags(1, 0, (1 << 0) | (1 << 3) | (1 << 4))
+        self.vapi.bridge_flags(bd_id=1, is_set=0,
+                               flags=(1 << 0) | (1 << 3) | (1 << 4))
 
         #
         # Add a DVR route to steer traffic at L3
@@ -324,10 +344,10 @@ class TestDVR(VppTestCase):
         #
         # Enable L3 extraction on pgs
         #
-        self.vapi.sw_interface_set_l2_emulation(self.pg0.sw_if_index)
-        self.vapi.sw_interface_set_l2_emulation(self.pg1.sw_if_index)
-        self.vapi.sw_interface_set_l2_emulation(sub_if_on_pg2.sw_if_index)
-        self.vapi.sw_interface_set_l2_emulation(sub_if_on_pg3.sw_if_index)
+        self.vapi.l2_emulation(self.pg0.sw_if_index)
+        self.vapi.l2_emulation(self.pg1.sw_if_index)
+        self.vapi.l2_emulation(sub_if_on_pg2.sw_if_index)
+        self.vapi.l2_emulation(sub_if_on_pg3.sw_if_index)
 
         #
         # now we expect the packet forward according to the DVR route
@@ -356,23 +376,23 @@ class TestDVR(VppTestCase):
         #
         # cleanup
         #
-        self.vapi.sw_interface_set_l2_emulation(self.pg0.sw_if_index,
-                                                enable=0)
-        self.vapi.sw_interface_set_l2_emulation(self.pg1.sw_if_index,
-                                                enable=0)
-        self.vapi.sw_interface_set_l2_emulation(sub_if_on_pg2.sw_if_index,
-                                                enable=0)
-        self.vapi.sw_interface_set_l2_emulation(sub_if_on_pg3.sw_if_index,
-                                                enable=0)
-
-        self.vapi.sw_interface_set_l2_bridge(self.pg0.sw_if_index,
-                                             1, enable=0)
-        self.vapi.sw_interface_set_l2_bridge(self.pg1.sw_if_index,
-                                             1, enable=0)
-        self.vapi.sw_interface_set_l2_bridge(sub_if_on_pg2.sw_if_index,
-                                             1, enable=0)
-        self.vapi.sw_interface_set_l2_bridge(sub_if_on_pg3.sw_if_index,
-                                             1, enable=0)
+        self.vapi.l2_emulation(self.pg0.sw_if_index,
+                               enable=0)
+        self.vapi.l2_emulation(self.pg1.sw_if_index,
+                               enable=0)
+        self.vapi.l2_emulation(sub_if_on_pg2.sw_if_index,
+                               enable=0)
+        self.vapi.l2_emulation(sub_if_on_pg3.sw_if_index,
+                               enable=0)
+
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=self.pg0.sw_if_index, bd_id=1, enable=0)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=self.pg1.sw_if_index, bd_id=1, enable=0)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=sub_if_on_pg2.sw_if_index, bd_id=1, enable=0)
+        self.vapi.sw_interface_set_l2_bridge(
+            rx_sw_if_index=sub_if_on_pg3.sw_if_index, bd_id=1, enable=0)
 
         route_1.remove_vpp_config()
         route_2.remove_vpp_config()