X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_bond.py;h=27da15c5ab5148ad56bd4dcbdfa7fecd8610e5be;hb=546f955b3dad6c0866a8ba778d0cfe1ef43d81d4;hp=d1ae77ad3f5e39dc2d69a913d5632269987e48ba;hpb=751e3f3824fc1a318f8c71ade664bd13c16b335e;p=vpp.git diff --git a/test/test_bond.py b/test/test_bond.py index d1ae77ad3f5..27da15c5ab5 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): @@ -70,10 +71,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() @@ -86,13 +86,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) @@ -276,5 +272,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)