PAPI: Add MACAddress object wrapper for vl_api_mac_address_t

[vpp.git] / test / test_bond.py

diff --git a/test/test_bond.py b/test/test_bond.py
index b54a1f1..9926d23 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,


@@ -136,19 +136,11 @@ class TestBondInterface(VppTestCase):
                 found = 1
         self.assertEqual(found, 1)
 
                 found = 1
         self.assertEqual(found, 1)
 

-        # pg0 tx bytes = 142
-        intfs = self.vapi.cli("show interface pg0").split("\n")
-        found = 0
-        for intf in intfs:
-            if "tx bytes" in intf and "142" in intf:
-                found = 1
-        self.assertEqual(found, 1)
-
-        # pg0 tx bytes = 142
-        intfs = self.vapi.cli("show interface pg1").split("\n")
+        # BondEthernet0 tx bytes = 284
+        intfs = self.vapi.cli("show interface BondEthernet0").split("\n")

         found = 0
         for intf in intfs:
         found = 0
         for intf in intfs:

-            if "tx bytes" in intf and "142" in intf:
+            if "tx bytes" in intf and "284" in intf:

                 found = 1
         self.assertEqual(found, 1)
 
                 found = 1
         self.assertEqual(found, 1)