commit a5b2eec0535f9025319a752891d77ff9948ae0df
author Ole Troan <ot@cisco.com> Mon Mar 11 19:23:25 2019 +0100
committer Paul Vinciguerra <pvinci@vinciconsulting.com> Mon Mar 11 21:57:19 2019 +0000
tree 08c801cb85ab9639e00e5f565e613b817b3924e4
parent 2d9b427a5b20dcec3d2212a3a8a47c29b4acdd46

vpp_papi_provider: Remove more wrapper functions.

Split this work up into pieces.
Please don't add new wrappers to vpp_papi_provider.py.

Change-Id: I0f8f2afc4cd2bba07ea70ddecea2d7319f7b2e10
Signed-off-by: Ole Troan <ot@cisco.com>

test/test_vtr.py

diff --git a/test/test_vtr.py b/test/test_vtr.py
index 02df2ce..d69dd20 100644
--- a/test/test_vtr.py
+++ b/test/test_vtr.py
@@ -49,7 +49,7 @@
             for pg_if in cls.pg_interfaces:
                 sw_if_index = pg_if.sub_if.sw_if_index \
                     if hasattr(pg_if, 'sub_if') else pg_if.sw_if_index
-                cls.vapi.sw_interface_set_l2_bridge(sw_if_index,
+                cls.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=sw_if_index,
                                                     bd_id=cls.bd_id)
 
             # setup all interfaces
@@ -168,8 +168,8 @@
             return
 
         i = VppDot1QSubint(self, self.pg0, tags[0].vlan)
-        self.vapi.sw_interface_set_l2_bridge(
-            i.sw_if_index, bd_id=self.bd_id, enable=1)
+        self.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=i.sw_if_index,
+                                             bd_id=self.bd_id, enable=1)
         i.admin_up()
 
         p = self.create_packet(self.pg0, swif, do_dot1=False)
@@ -181,8 +181,8 @@
         swif.sub_if.remove_dot1_layer(rx[0])
         self.assertTrue(Dot1Q not in rx[0])
 
-        self.vapi.sw_interface_set_l2_bridge(
-            i.sw_if_index, bd_id=self.bd_id, enable=0)
+        self.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=i.sw_if_index,
+                                             bd_id=self.bd_id, enable=0)
         i.remove_vpp_config()
 
     def test_1ad_vtr_pop_1(self):