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>

1 files changed, 25 insertions, 29 deletions

diff --git a/test/test_geneve.py b/test/test_geneve.py
index d77bfbfcff1..ebe95a0f1a0 100644
--- a/test/test_geneve.py
+++ b/test/test_geneve.py
@@ -89,12 +89,14 @@ class TestGeneve(BridgeDomain, VppTestCase):
         for dest_ip4n in ip4n_range(next_hop_address, ip_range_start,
                                     ip_range_end):
             # add host route so dest_ip4n will not be resolved
-            cls.vapi.ip_add_del_route(dest_ip4n, 32, next_hop_address)
+            cls.vapi.ip_add_del_route(dst_address=dest_ip4n,
+                                      dst_address_length=32,
+                                      next_hop_address=next_hop_address)
             r = cls.vapi.geneve_add_del_tunnel(
-                local_addr=cls.pg0.local_ip4n,
-                remote_addr=dest_ip4n,
+                local_address=cls.pg0.local_ip4n, remote_address=dest_ip4n,
                 vni=vni)
-            cls.vapi.sw_interface_set_l2_bridge(r.sw_if_index, bd_id=vni)
+            cls.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index,
+                                                bd_id=vni)
 
     @classmethod
     def add_del_shared_mcast_dst_load(cls, is_add):
@@ -107,11 +109,9 @@ class TestGeneve(BridgeDomain, VppTestCase):
         vni_end = vni_start + n_shared_dst_tunnels
         for vni in range(vni_start, vni_end):
             r = cls.vapi.geneve_add_del_tunnel(
-                local_addr=cls.pg0.local_ip4n,
-                remote_addr=cls.mcast_ip4n,
-                mcast_sw_if_index=1,
-                vni=vni,
-                is_add=is_add)
+                local_address=cls.pg0.local_ip4n,
+                remote_address=cls.mcast_ip4n, mcast_sw_if_index=1,
+                is_add=is_add, vni=vni)
             if r.sw_if_index == 0xffffffff:
                 raise "bad sw_if_index"
 
@@ -134,12 +134,10 @@ class TestGeneve(BridgeDomain, VppTestCase):
         for dest_ip4n in ip4n_range(cls.mcast_ip4n, ip_range_start,
                                     ip_range_end):
             vni = bytearray(dest_ip4n)[3]
-            cls.vapi.geneve_add_del_tunnel(
-                local_addr=cls.pg0.local_ip4n,
-                remote_addr=dest_ip4n,
-                mcast_sw_if_index=1,
-                vni=vni,
-                is_add=is_add)
+            cls.vapi.geneve_add_del_tunnel(local_address=cls.pg0.local_ip4n,
+                                           remote_address=dest_ip4n,
+                                           mcast_sw_if_index=1, is_add=is_add,
+                                           vni=vni)
 
     @classmethod
     def add_mcast_tunnels_load(cls):
@@ -183,13 +181,12 @@ class TestGeneve(BridgeDomain, VppTestCase):
             #  into BD.
             cls.single_tunnel_bd = 1
             r = cls.vapi.geneve_add_del_tunnel(
-                local_addr=cls.pg0.local_ip4n,
-                remote_addr=cls.pg0.remote_ip4n,
-                vni=cls.single_tunnel_bd)
-            cls.vapi.sw_interface_set_l2_bridge(r.sw_if_index,
-                                                bd_id=cls.single_tunnel_bd)
-            cls.vapi.sw_interface_set_l2_bridge(cls.pg1.sw_if_index,
+                local_address=cls.pg0.local_ip4n,
+                remote_address=cls.pg0.remote_ip4n, vni=cls.single_tunnel_bd)
+            cls.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index,
                                                 bd_id=cls.single_tunnel_bd)
+            cls.vapi.sw_interface_set_l2_bridge(
+                rx_sw_if_index=cls.pg1.sw_if_index, bd_id=cls.single_tunnel_bd)
 
             # Setup vni 2 to test multicast flooding
             cls.n_ucast_tunnels = 10
@@ -197,14 +194,13 @@ class TestGeneve(BridgeDomain, VppTestCase):
             cls.create_geneve_flood_test_bd(cls.mcast_flood_bd,
                                             cls.n_ucast_tunnels)
             r = cls.vapi.geneve_add_del_tunnel(
-                local_addr=cls.pg0.local_ip4n,
-                remote_addr=cls.mcast_ip4n,
-                mcast_sw_if_index=1,
+                local_address=cls.pg0.local_ip4n,
+                remote_address=cls.mcast_ip4n, mcast_sw_if_index=1,
                 vni=cls.mcast_flood_bd)
-            cls.vapi.sw_interface_set_l2_bridge(r.sw_if_index,
-                                                bd_id=cls.mcast_flood_bd)
-            cls.vapi.sw_interface_set_l2_bridge(cls.pg2.sw_if_index,
+            cls.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index,
                                                 bd_id=cls.mcast_flood_bd)
+            cls.vapi.sw_interface_set_l2_bridge(
+                rx_sw_if_index=cls.pg2.sw_if_index, bd_id=cls.mcast_flood_bd)
 
             # Add and delete mcast tunnels to check stability
             cls.add_shared_mcast_dst_load()
@@ -216,8 +212,8 @@ class TestGeneve(BridgeDomain, VppTestCase):
             cls.ucast_flood_bd = 3
             cls.create_geneve_flood_test_bd(cls.ucast_flood_bd,
                                             cls.n_ucast_tunnels)
-            cls.vapi.sw_interface_set_l2_bridge(cls.pg3.sw_if_index,
-                                                bd_id=cls.ucast_flood_bd)
+            cls.vapi.sw_interface_set_l2_bridge(
+                rx_sw_if_index=cls.pg3.sw_if_index, bd_id=cls.ucast_flood_bd)
         except Exception:
             super(TestGeneve, cls).tearDownClass()
             raise