Revert "API: Cleanup APIs interface.api"

This reverts commit e63325e3ca.

Allow time for CSIT to accommodate.

Change-Id: I59435e4ab5e05e36a2796c3bf44889b5d4823cc2
Signed-off-by: ot@cisco.com

test/test_bond.py

@@ -9,7 +9,6 @@ from scapy.layers.l2 import Ether
 from scapy.layers.inet import IP, UDP
 from vpp_bond_interface import VppBondInterface
 from vpp_papi import MACAddress
-from vpp_ip import VppIpPrefix
 
 
 class TestBondInterface(VppTestCase):
@@ -65,9 +64,10 @@ class TestBondInterface(VppTestCase):
                                  mac_address=mac)
         bond0.add_vpp_config()
         bond0.admin_up()
-        self.vapi.sw_interface_add_del_address(
-            sw_if_index=bond0.sw_if_index,
-            prefix=VppIpPrefix("10.10.10.1", 24).encode())
+        bond0_addr = socket.inet_pton(socket.AF_INET, "10.10.10.1")
+        self.vapi.sw_interface_add_del_address(sw_if_index=bond0.sw_if_index,
+                                               address=bond0_addr,
+                                               address_length=24)
 
         self.pg2.config_ip4()
         self.pg2.resolve_arp()