api: Add API support for marvell PP2 plugin

[vpp.git] / test / test_bond.py

diff --git a/test/test_bond.py b/test/test_bond.py
index e354601..27da15c 100644 (file)
--- a/test/test_bond.py
+++ b/test/test_bond.py
@@ -7,8 +7,9 @@ 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 util import mactobinary

 from vpp_bond_interface import VppBondInterface
 from vpp_bond_interface import VppBondInterface

+from vpp_papi import MACAddress
+from vpp_ip import VppIpPrefix

 
 
 class TestBondInterface(VppTestCase):
 
 
 class TestBondInterface(VppTestCase):


@@ -31,13 +32,18 @@ class TestBondInterface(VppTestCase):
         for i in cls.pg_interfaces:
             i.admin_up()
 
         for i in cls.pg_interfaces:
             i.admin_up()
 

+    @classmethod
+    def tearDownClass(cls):
+        super(TestBondInterface, cls).tearDownClass()
+

     def setUp(self):
         super(TestBondInterface, self).setUp()
 
     def tearDown(self):
         super(TestBondInterface, self).tearDown()
     def setUp(self):
         super(TestBondInterface, self).setUp()
 
     def tearDown(self):
         super(TestBondInterface, self).tearDown()

-        if not self.vpp_dead:
-            self.logger.info(self.vapi.ppcli("show interface"))
+
+    def show_commands_at_teardown(self):
+        self.logger.info(self.vapi.ppcli("show interface"))

 
     def test_bond_traffic(self):
         """ Bond traffic test """
 
     def test_bond_traffic(self):
         """ Bond traffic test """


@@ -56,18 +62,18 @@ class TestBondInterface(VppTestCase):
         # create interface (BondEthernet0)
         #        self.logger.info("create bond")
         bond0_mac = "02:fe:38:30:59:3c"
         # create interface (BondEthernet0)
         #        self.logger.info("create bond")
         bond0_mac = "02:fe:38:30:59:3c"

-        mac = mactobinary(bond0_mac)
+        mac = MACAddress(bond0_mac).packed

         bond0 = VppBondInterface(self,
                                  mode=3,
                                  lb=1,
         bond0 = VppBondInterface(self,
                                  mode=3,
                                  lb=1,

+                                 numa_only=0,

                                  use_custom_mac=1,
                                  mac_address=mac)
         bond0.add_vpp_config()
         bond0.admin_up()
                                  use_custom_mac=1,
                                  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(bond0.sw_if_index,
-                                               bond0_addr,
-                                               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()
 
         self.pg2.config_ip4()
         self.pg2.resolve_arp()


@@ -80,13 +86,9 @@ class TestBondInterface(VppTestCase):
 
         # enslave pg0 and pg1 to BondEthernet0
         self.logger.info("bond enslave interface pg0 to BondEthernet0")
 
         # 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")
         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)
 
         # verify both slaves in BondEthernet0
         if_dump = self.vapi.sw_interface_slave_dump(bond0.sw_if_index)


@@ -228,8 +230,8 @@ class TestBondInterface(VppTestCase):
 
         # verify both interfaces in the show
         ifs = self.vapi.cli("show interface")
 
         # 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()
 
         # verify they are in the dump also
         if_dump = self.vapi.sw_interface_bond_dump()


@@ -244,10 +246,10 @@ class TestBondInterface(VppTestCase):
 
         ifs = self.vapi.cli("show interface")
         # verify BondEthernet0 still in the show
 
         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
 
         # 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()
 
         # verify BondEthernet1 is not in the dump
         if_dump = self.vapi.sw_interface_bond_dump()


@@ -264,11 +266,12 @@ class TestBondInterface(VppTestCase):
 
         # verify BondEthernet0 not in the show
         ifs = self.vapi.cli("show interface")
 
         # 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()
         self.assertFalse(bond0.is_interface_config_in_dump(if_dump))
 
 
         # verify BondEthernet0 is not in the dump
         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)
 if __name__ == '__main__':
     unittest.main(testRunner=VppTestRunner)