Code Review / vpp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
vcl: rx dequeue notifications with epoll
[vpp.git] / test / test_bond.py
diff --git a/test/test_bond.py b/test/test_bond.py
index dab0dd1..c5d786f 100644 (file)
--- a/test/test_bond.py
+++ b/test/test_bond.py
@@ -3,10 +3,11 @@
 import socket
 import unittest
 
 import socket
 import unittest
 
-from framework import VppTestCase, VppTestRunner
 from scapy.packet import Raw
 from scapy.layers.l2 import Ether
 from scapy.layers.inet import IP, UDP
 from scapy.packet import Raw
 from scapy.layers.l2 import Ether
 from scapy.layers.inet import IP, UDP
+
+from framework import VppTestCase, VppTestRunner
 from vpp_bond_interface import VppBondInterface
 from vpp_papi import MACAddress, VppEnum
 
 from vpp_bond_interface import VppBondInterface
 from vpp_papi import MACAddress, VppEnum
 
@@ -51,11 +52,11 @@ class TestBondInterface(VppTestCase):
         #
         # RX->              TX->
         #
         #
         # RX->              TX->
         #
-        # pg2 ------+        +------pg0 (slave)
+        # pg2 ------+        +------pg0 (member)
         #           |        |
         #          BondEthernet0 (10.10.10.1)
         #           |        |
         #           |        |
         #          BondEthernet0 (10.10.10.1)
         #           |        |
-        # pg3 ------+        +------pg1 (slave)
+        # pg3 ------+        +------pg1 (memberx)
         #
 
         # create interface (BondEthernet0)
         #
 
         # create interface (BondEthernet0)
@@ -83,14 +84,14 @@ class TestBondInterface(VppTestCase):
         self.logger.info(self.vapi.cli("show interface address"))
         self.logger.info(self.vapi.cli("show ip neighbors"))
 
         self.logger.info(self.vapi.cli("show interface address"))
         self.logger.info(self.vapi.cli("show ip neighbors"))
 
-        # 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)
-        self.logger.info("bond enslave interface pg1 to BondEthernet0")
-        bond0.enslave_vpp_bond_interface(sw_if_index=self.pg1.sw_if_index)
+        # add member pg0 and pg1 to BondEthernet0
+        self.logger.info("bond add member interface pg0 to BondEthernet0")
+        bond0.add_member_vpp_bond_interface(sw_if_index=self.pg0.sw_if_index)
+        self.logger.info("bond add_member interface pg1 to BondEthernet0")
+        bond0.add_member_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)
+        # verify both members in BondEthernet0
+        if_dump = self.vapi.sw_member_interface_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))
 
         self.assertTrue(self.pg0.is_interface_config_in_dump(if_dump))
         self.assertTrue(self.pg1.is_interface_config_in_dump(if_dump))
 
@@ -163,8 +164,8 @@ class TestBondInterface(VppTestCase):
 
         bond0.remove_vpp_config()
 
 
         bond0.remove_vpp_config()
 
-    def test_bond_enslave(self):
-        """ Bond enslave/detach slave test """
+    def test_bond_add_member(self):
+        """ Bond add_member/detach member test """
 
         # create interface (BondEthernet0) and set bond mode to LACP
         self.logger.info("create bond")
 
         # create interface (BondEthernet0) and set bond mode to LACP
         self.logger.info("create bond")
@@ -172,25 +173,27 @@ class TestBondInterface(VppTestCase):
         bond0.add_vpp_config()
         bond0.admin_up()
 
         bond0.add_vpp_config()
         bond0.admin_up()
 
-        # verify that interfaces can be enslaved and detached two times
+        # verify that interfaces can be added as_member and detached two times
         for i in range(2):
             # verify pg0 and pg1 not in BondEthernet0
         for i in range(2):
             # verify pg0 and pg1 not in BondEthernet0
-            if_dump = self.vapi.sw_interface_slave_dump(bond0.sw_if_index)
+            if_dump = self.vapi.sw_member_interface_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))
 
             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)
+            # add_member pg0 and pg1 to BondEthernet0
+            self.logger.info("bond add_member interface pg0 to BondEthernet0")
+            bond0.add_member_vpp_bond_interface(
+                sw_if_index=self.pg0.sw_if_index,
+                is_passive=0,
+                is_long_timeout=0)
+
+            self.logger.info("bond add_member interface pg1 to BondEthernet0")
+            bond0.add_member_vpp_bond_interface(
+                sw_if_index=self.pg1.sw_if_index,
+                is_passive=0,
+                is_long_timeout=0)
+            # verify both members in BondEthernet0
+            if_dump = self.vapi.sw_member_interface_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))
 
             self.assertTrue(self.pg0.is_interface_config_in_dump(if_dump))
             self.assertTrue(self.pg1.is_interface_config_in_dump(if_dump))
 
@@ -199,7 +202,7 @@ class TestBondInterface(VppTestCase):
             bond0.detach_vpp_bond_interface(sw_if_index=self.pg0.sw_if_index)
 
             # verify pg0 is not in BondEthernet0, but pg1 is
             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)
+            if_dump = self.vapi.sw_member_interface_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))
 
             self.assertFalse(self.pg0.is_interface_config_in_dump(if_dump))
             self.assertTrue(self.pg1.is_interface_config_in_dump(if_dump))
 
@@ -208,7 +211,7 @@ class TestBondInterface(VppTestCase):
             bond0.detach_vpp_bond_interface(sw_if_index=self.pg1.sw_if_index)
 
             # verify pg0 and pg1 not in BondEthernet0
             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)
+            if_dump = self.vapi.sw_member_interface_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))
 
             self.assertFalse(self.pg0.is_interface_config_in_dump(if_dump))
             self.assertFalse(self.pg1.is_interface_config_in_dump(if_dump))
 
@@ -234,7 +237,7 @@ class TestBondInterface(VppTestCase):
         self.assertIn('BondEthernet1', ifs)
 
         # verify they are in the dump also
         self.assertIn('BondEthernet1', ifs)
 
         # verify they are in the dump also
-        if_dump = self.vapi.sw_interface_bond_dump()
+        if_dump = self.vapi.sw_bond_interface_dump(sw_if_index=0xFFFFFFFF)
         self.assertTrue(bond0.is_interface_config_in_dump(if_dump))
         self.assertTrue(bond1.is_interface_config_in_dump(if_dump))
 
         self.assertTrue(bond0.is_interface_config_in_dump(if_dump))
         self.assertTrue(bond1.is_interface_config_in_dump(if_dump))
 
@@ -252,7 +255,7 @@ class TestBondInterface(VppTestCase):
         self.assertNotIn('BondEthernet1', ifs)
 
         # verify BondEthernet1 is not in the dump
         self.assertNotIn('BondEthernet1', ifs)
 
         # verify BondEthernet1 is not in the dump
-        if_dump = self.vapi.sw_interface_bond_dump()
+        if_dump = self.vapi.sw_bond_interface_dump(sw_if_index=0xFFFFFFFF)
         self.assertFalse(bond1.is_interface_config_in_dump(if_dump))
 
         # verify BondEthernet0 is still in the dump
         self.assertFalse(bond1.is_interface_config_in_dump(if_dump))
 
         # verify BondEthernet0 is still in the dump
@@ -269,7 +272,8 @@ class TestBondInterface(VppTestCase):
         self.assertNotIn('BondEthernet0', ifs)
 
         # verify BondEthernet0 is not in the dump
         self.assertNotIn('BondEthernet0', ifs)
 
         # verify BondEthernet0 is not in the dump
-        if_dump = self.vapi.sw_interface_bond_dump()
+        if_dump = self.vapi.sw_bond_interface_dump(
+            sw_if_index=bond0.sw_if_index)
         self.assertFalse(bond0.is_interface_config_in_dump(if_dump))
 
     def test_bond_link(self):
         self.assertFalse(bond0.is_interface_config_in_dump(if_dump))
 
     def test_bond_link(self):
@@ -286,44 +290,21 @@ class TestBondInterface(VppTestCase):
                                  mode=bond_modes.BOND_API_MODE_ROUND_ROBIN)
         bond0.add_vpp_config()
 
                                  mode=bond_modes.BOND_API_MODE_ROUND_ROBIN)
         bond0.add_vpp_config()
 
-        # initially admin state is down and link is down
-        bond0.assert_interface_state(0, 0)
-
-        # set bond admin up. confirm link down because no slaves are active
+        # set bond admin up.
         self.logger.info("set interface BondEthernet0 admin up")
         bond0.admin_up()
         self.logger.info("set interface BondEthernet0 admin up")
         bond0.admin_up()
-        bond0.assert_interface_state(intf_flags.IF_STATUS_API_FLAG_ADMIN_UP, 0)
-
-        # make sure slaves are down. enslave them to bond.
-        self.logger.info("set interface pg0 admin down")
-        self.pg0.admin_down()
-        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("set interface pg1 admin down")
-        self.pg1.admin_down()
-        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)
-
-        # bring slaves up, confirm bond link is up
-        self.logger.info("set interface pg0 admin up")
-        self.pg0.admin_up()
-        self.logger.info("set interface pg1 admin up")
-        self.pg1.admin_up()
+        # confirm link up
         bond0.assert_interface_state(intf_flags.IF_STATUS_API_FLAG_ADMIN_UP,
                                      intf_flags.IF_STATUS_API_FLAG_LINK_UP)
 
         bond0.assert_interface_state(intf_flags.IF_STATUS_API_FLAG_ADMIN_UP,
                                      intf_flags.IF_STATUS_API_FLAG_LINK_UP)
 
-        # detach pg0, pg1
-        self.logger.info("detach interface pg0")
-        bond0.detach_vpp_bond_interface(sw_if_index=self.pg0.sw_if_index)
-        self.logger.info("detach interface pg1")
-        bond0.detach_vpp_bond_interface(sw_if_index=self.pg1.sw_if_index)
+        # toggle bond admin state
+        self.logger.info("toggle interface BondEthernet0")
+        bond0.admin_down()
+        bond0.admin_up()
 
 
-        # link should be down now
-        bond0.assert_interface_state(intf_flags.IF_STATUS_API_FLAG_ADMIN_UP, 0)
+        # confirm link is still up
+        bond0.assert_interface_state(intf_flags.IF_STATUS_API_FLAG_ADMIN_UP,
+                                     intf_flags.IF_STATUS_API_FLAG_LINK_UP)
 
         # delete BondEthernet0
         self.logger.info("Deleting BondEthernet0")
 
         # delete BondEthernet0
         self.logger.info("Deleting BondEthernet0")
Vector Packet Processing