crypto: fix init dependency

[vpp.git] / test / test_bond.py

diff --git a/test/test_bond.py b/test/test_bond.py
index e354601..533038e 100644 (file)
--- a/test/test_bond.py
+++ b/test/test_bond.py
@@ -7,8 +7,8 @@ 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

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


@@ -56,7 +56,7 @@ 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,


@@ -65,9 +65,9 @@ class TestBondInterface(VppTestCase):
         bond0.add_vpp_config()
         bond0.admin_up()
         bond0_addr = socket.inet_pton(socket.AF_INET, "10.10.10.1")
         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,
+                                               address=bond0_addr,
+                                               address_length=24)

 
         self.pg2.config_ip4()
         self.pg2.resolve_arp()
 
         self.pg2.config_ip4()
         self.pg2.resolve_arp()


@@ -228,8 +228,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 +244,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,7 +264,7 @@ 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()
 
         # verify BondEthernet0 is not in the dump
         if_dump = self.vapi.sw_interface_bond_dump()