X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_neighbor.py;fp=test%2Fvpp_neighbor.py;h=b38aae89e7466fab105d784ad6a9e1116e39db97;hb=1e18eb20c34d2b5e3b815c34831a78a14af98259;hp=7391447ff9b6cfc69ab6f7c47d5b2d2a895f34e9;hpb=9338fc644da4e1d9d9ac9f1e3886f555918026f8;p=vpp.git diff --git a/test/vpp_neighbor.py b/test/vpp_neighbor.py index 7391447ff9b..b38aae89e74 100644 --- a/test/vpp_neighbor.py +++ b/test/vpp_neighbor.py @@ -7,10 +7,14 @@ from ipaddress import ip_address from vpp_object import * from vpp_papi import mac_pton, VppEnum +try: + text_type = unicode +except NameError: + text_type = str def find_nbr(test, sw_if_index, nbr_addr, is_static=0, mac=None): - ip_addr = ip_address(unicode(nbr_addr)) + ip_addr = ip_address(text_type(nbr_addr)) e = VppEnum.vl_api_ip_neighbor_flags_t nbrs = test.vapi.ip_neighbor_dump(sw_if_index, is_ipv6=(6 is ip_addr.version))