X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_bond.py;h=dd4a6453977bf28b363e44f82a47f2012a9e4d6e;hb=c87fbb417;hp=f6a9b08426b2c01d057e58f3fe617ec21edc066a;hpb=f6dee6c8bac17aadfa0378a6e00fdc448a3c3a6d;p=vpp.git diff --git a/test/test_bond.py b/test/test_bond.py index f6a9b08426b..dd4a6453977 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 @@ -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): @@ -73,7 +72,7 @@ class TestBondInterface(VppTestCase): 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()) + prefix="10.10.10.1/24") self.pg2.config_ip4() self.pg2.resolve_arp() @@ -82,7 +81,7 @@ class TestBondInterface(VppTestCase): self.logger.info(self.vapi.cli("show interface")) self.logger.info(self.vapi.cli("show interface address")) - self.logger.info(self.vapi.cli("show ip arp")) + self.logger.info(self.vapi.cli("show ip neighbors")) # enslave pg0 and pg1 to BondEthernet0 self.logger.info("bond enslave interface pg0 to BondEthernet0") @@ -117,9 +116,9 @@ class TestBondInterface(VppTestCase): # set up the static arp entries pointing to the BondEthernet0 interface # so that it does not try to resolve the ip address self.logger.info(self.vapi.cli( - "set ip arp static BondEthernet0 10.10.10.12 abcd.abcd.0002")) + "set ip neighbor static BondEthernet0 10.10.10.12 abcd.abcd.0002")) self.logger.info(self.vapi.cli( - "set ip arp static BondEthernet0 10.10.10.11 abcd.abcd.0004")) + "set ip neighbor static BondEthernet0 10.10.10.11 abcd.abcd.0004")) # clear the interface counters self.logger.info(self.vapi.cli("clear interfaces")) @@ -167,50 +166,51 @@ class TestBondInterface(VppTestCase): def test_bond_enslave(self): """ Bond enslave/detach slave test """ - # create interface (BondEthernet0) + # create interface (BondEthernet0) and set bond mode to LACP self.logger.info("create bond") - bond0 = VppBondInterface(self, mode=3) + bond0 = VppBondInterface(self, mode=5) bond0.add_vpp_config() bond0.admin_up() - # verify pg0 and pg1 not in BondEthernet0 - if_dump = self.vapi.sw_interface_slave_dump(bond0.sw_if_index) - self.assertFalse(self.pg0.is_interface_config_in_dump(if_dump)) - self.assertFalse(self.pg1.is_interface_config_in_dump(if_dump)) - - # 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) - - 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) - - # verify both slaves in BondEthernet0 - if_dump = self.vapi.sw_interface_slave_dump(bond0.sw_if_index) - self.assertTrue(self.pg0.is_interface_config_in_dump(if_dump)) - self.assertTrue(self.pg1.is_interface_config_in_dump(if_dump)) - - # detach interface pg0 - self.logger.info("detach interface pg0") - bond0.detach_vpp_bond_interface(sw_if_index=self.pg0.sw_if_index) - - # verify pg0 is not in BondEthernet0, but pg1 is - if_dump = self.vapi.sw_interface_slave_dump(bond0.sw_if_index) - self.assertFalse(self.pg0.is_interface_config_in_dump(if_dump)) - self.assertTrue(self.pg1.is_interface_config_in_dump(if_dump)) - - # detach interface pg1 - self.logger.info("detach interface pg1") - bond0.detach_vpp_bond_interface(sw_if_index=self.pg1.sw_if_index) - - # verify pg0 and pg1 not in BondEthernet0 - if_dump = self.vapi.sw_interface_slave_dump(bond0.sw_if_index) - self.assertFalse(self.pg0.is_interface_config_in_dump(if_dump)) - self.assertFalse(self.pg1.is_interface_config_in_dump(if_dump)) + # verify that interfaces can be enslaved and detached two times + for i in range(2): + # verify pg0 and pg1 not in BondEthernet0 + if_dump = self.vapi.sw_interface_slave_dump(bond0.sw_if_index) + self.assertFalse(self.pg0.is_interface_config_in_dump(if_dump)) + self.assertFalse(self.pg1.is_interface_config_in_dump(if_dump)) + + # 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) + + 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) + # verify both slaves in BondEthernet0 + if_dump = self.vapi.sw_interface_slave_dump(bond0.sw_if_index) + self.assertTrue(self.pg0.is_interface_config_in_dump(if_dump)) + self.assertTrue(self.pg1.is_interface_config_in_dump(if_dump)) + + # detach interface pg0 + self.logger.info("detach interface pg0") + bond0.detach_vpp_bond_interface(sw_if_index=self.pg0.sw_if_index) + + # verify pg0 is not in BondEthernet0, but pg1 is + if_dump = self.vapi.sw_interface_slave_dump(bond0.sw_if_index) + self.assertFalse(self.pg0.is_interface_config_in_dump(if_dump)) + self.assertTrue(self.pg1.is_interface_config_in_dump(if_dump)) + + # detach interface pg1 + self.logger.info("detach interface pg1") + bond0.detach_vpp_bond_interface(sw_if_index=self.pg1.sw_if_index) + + # verify pg0 and pg1 not in BondEthernet0 + if_dump = self.vapi.sw_interface_slave_dump(bond0.sw_if_index) + self.assertFalse(self.pg0.is_interface_config_in_dump(if_dump)) + self.assertFalse(self.pg1.is_interface_config_in_dump(if_dump)) bond0.remove_vpp_config()