X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_bond.py;h=29ad33d7a4ec59b1c8e8771cb40c281ecb257e04;hb=66cea092c7a584bb7b82000fbfad349e6f0af7e1;hp=d1ae77ad3f5e39dc2d69a913d5632269987e48ba;hpb=751e3f3824fc1a318f8c71ade664bd13c16b335e;p=vpp.git

diff --git a/test/test_bond.py b/test/test_bond.py
index d1ae77ad3f5..29ad33d7a4e 100644
--- a/test/test_bond.py
+++ b/test/test_bond.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import socket
 import unittest
@@ -70,10 +70,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="10.10.10.1/24")
 
         self.pg2.config_ip4()
         self.pg2.resolve_arp()
@@ -86,13 +85,9 @@ class TestBondInterface(VppTestCase):
 
         # enslave pg0 and pg1 to BondEthernet0
         self.logger.info("bond enslave interface pg0 to BondEthernet0")
-        bond0.enslave_vpp_bond_interface(sw_if_index=self.pg0.sw_if_index,
-                                         is_passive=0,
-                                         is_long_timeout=0)
+        bond0.enslave_vpp_bond_interface(sw_if_index=self.pg0.sw_if_index)
         self.logger.info("bond enslave interface pg1 to BondEthernet0")
-        bond0.enslave_vpp_bond_interface(sw_if_index=self.pg1.sw_if_index,
-                                         is_passive=0,
-                                         is_long_timeout=0)
+        bond0.enslave_vpp_bond_interface(sw_if_index=self.pg1.sw_if_index)
 
         # verify both slaves in BondEthernet0
         if_dump = self.vapi.sw_interface_slave_dump(bond0.sw_if_index)
@@ -104,7 +99,7 @@ class TestBondInterface(VppTestCase):
         p2 = (Ether(src=bond0_mac, dst=self.pg2.local_mac) /
               IP(src=self.pg2.local_ip4, dst="10.10.10.12") /
               UDP(sport=1235, dport=1235) /
-              Raw('\xa5' * 100))
+              Raw(b'\xa5' * 100))
         self.pg2.add_stream(p2)
 
         # generate a packet from pg3 -> BondEthernet0 -> pg0
@@ -113,7 +108,7 @@ class TestBondInterface(VppTestCase):
         p3 = (Ether(src=bond0_mac, dst=self.pg3.local_mac) /
               IP(src=self.pg3.local_ip4, dst="10.10.10.11") /
               UDP(sport=1234, dport=1234) /
-              Raw('\xa5' * 100))
+              Raw(b'\xa5' * 100))
         self.pg3.add_stream(p3)
 
         self.pg_enable_capture(self.pg_interfaces)
@@ -276,5 +271,6 @@ class TestBondInterface(VppTestCase):
         if_dump = self.vapi.sw_interface_bond_dump()
         self.assertFalse(bond0.is_interface_config_in_dump(if_dump))
 
+
 if __name__ == '__main__':
     unittest.main(testRunner=VppTestRunner)