X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_bond.py;h=eb43281719e2b5d6d84710cafa027bcb2e7591ae;hb=e63325e3c;hp=c1dcb92cbb5eef9efc6ab534f36a354f98cc995e;hpb=9a475373ed9b1ff9952acc06353ddaa50c2c96bd;p=vpp.git

diff --git a/test/test_bond.py b/test/test_bond.py
index c1dcb92cbb5..eb43281719e 100644
--- a/test/test_bond.py
+++ b/test/test_bond.py
@@ -9,6 +9,7 @@ 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):
@@ -64,10 +65,9 @@ class TestBondInterface(VppTestCase):
                                  mac_address=mac)
         bond0.add_vpp_config()
         bond0.admin_up()
-        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.vapi.sw_interface_add_del_address(
+            sw_if_index=bond0.sw_if_index,
+            prefix=VppIpPrefix("10.10.10.1", 24).encode())
 
         self.pg2.config_ip4()
         self.pg2.resolve_arp()
@@ -228,8 +228,8 @@ class TestBondInterface(VppTestCase):
 
         # verify both interfaces in the show
         ifs = self.vapi.cli("show interface")
-        self.assertNotEqual(ifs.find('BondEthernet0'), -1)
-        self.assertNotEqual(ifs.find('BondEthernet1'), -1)
+        self.assertIn('BondEthernet0', ifs)
+        self.assertIn('BondEthernet1', ifs)
 
         # verify they are in the dump also
         if_dump = self.vapi.sw_interface_bond_dump()
@@ -244,10 +244,10 @@ class TestBondInterface(VppTestCase):
 
         ifs = self.vapi.cli("show interface")
         # verify BondEthernet0 still in the show
-        self.assertNotEqual(ifs.find('BondEthernet0'), -1)
+        self.assertIn('BondEthernet0', ifs)
 
         # verify BondEthernet1 not in the show
-        self.assertEqual(ifs.find('BondEthernet1'), -1)
+        self.assertNotIn('BondEthernet1', ifs)
 
         # verify BondEthernet1 is not in the dump
         if_dump = self.vapi.sw_interface_bond_dump()
@@ -264,7 +264,7 @@ class TestBondInterface(VppTestCase):
 
         # verify BondEthernet0 not in the show
         ifs = self.vapi.cli("show interface")
-        self.assertEqual(ifs.find('BondEthernet0'), -1)
+        self.assertNotIn('BondEthernet0', ifs)
 
         # verify BondEthernet0 is not in the dump
         if_dump = self.vapi.sw_interface_bond_dump()