diff options
| author |   Ole Troan <ot@cisco.com> | 2018-12-17 12:02:26 +0100 |
|---|---|---|
| committer |   Neale Ranns <nranns@cisco.com> | 2018-12-18 11:54:24 +0000 |
| commit | 8006c6aa425126529b4017768a9201e4f03964ad (patch) | |
| tree | 7b7342e6fb4964a5c8ca65c3d13d8dcc980f120d /test/test_p2p_ethernet.py | |
| parent | 02782d6ebd13ce02f2d3facebb54fec3c2137c88 (diff) | |
PAPI: Add MACAddress object wrapper for vl_api_mac_address_t
Change the definition of vl_api_mac_address_t to an aliased type.
Change-Id: I1434f316d0fad6a099592f39bceeb8faeaf1d134
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'test/test_p2p_ethernet.py')
| -rw-r--r-- | test/test_p2p_ethernet.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test_p2p_ethernet.py b/test/test_p2p_ethernet.py index f08d0cc2b1f..34a4c24f655 100644 --- a/test/test_p2p_ethernet.py +++ b/test/test_p2p_ethernet.py @@ -13,7 +13,7 @@ from framework import VppTestCase, VppTestRunner from vpp_sub_interface import VppP2PSubint from vpp_ip import DpoProto from vpp_ip_route import VppIpRoute, VppRoutePath -from vpp_mac import mactobinary +from vpp_papi import mac_pton class P2PEthernetAPI(VppTestCase): @@ -33,12 +33,12 @@ class P2PEthernetAPI(VppTestCase): i.admin_up() def create_p2p_ethernet(self, parent_if, sub_id, remote_mac): - p2p = VppP2PSubint(self, parent_if, sub_id, mactobinary(remote_mac)) + p2p = VppP2PSubint(self, parent_if, sub_id, mac_pton(remote_mac)) self.p2p_sub_ifs.append(p2p) def delete_p2p_ethernet(self, parent_if, remote_mac): self.vapi.delete_p2pethernet_subif(parent_if.sw_if_index, - mactobinary(remote_mac)) + mac_pton(remote_mac)) def test_api(self): """delete/create p2p subif""" @@ -79,7 +79,7 @@ class P2PEthernetAPI(VppTestCase): try: macs.append(':'.join(re.findall('..', '{:02x}'.format(mac+i)))) self.vapi.create_p2pethernet_subif(self.pg2.sw_if_index, - mactobinary(macs[i-1]), + mac_pton(macs[i-1]), i) except Exception: self.logger.info("Failed to create subif %d %s" % ( @@ -144,7 +144,7 @@ class P2PEthernetIPV6(VppTestCase): super(P2PEthernetIPV6, self).tearDown() def create_p2p_ethernet(self, parent_if, sub_id, remote_mac): - p2p = VppP2PSubint(self, parent_if, sub_id, mactobinary(remote_mac)) + p2p = VppP2PSubint(self, parent_if, sub_id, mac_pton(remote_mac)) p2p.admin_up() p2p.config_ip6() p2p.disable_ipv6_ra() @@ -389,7 +389,7 @@ class P2PEthernetIPV4(VppTestCase): return dst_if.get_capture(count) def create_p2p_ethernet(self, parent_if, sub_id, remote_mac): - p2p = VppP2PSubint(self, parent_if, sub_id, mactobinary(remote_mac)) + p2p = VppP2PSubint(self, parent_if, sub_id, mac_pton(remote_mac)) p2p.admin_up() p2p.config_ip4() return p2p |