X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_interface.py;h=a464bf3898437716dc180bd9270bf2e15d12ad75;hb=6e4c6ad92e59045f0babf5af5093cb8402ec37fb;hp=0f798cb63e6bf57f7b5b00789cb89273eb6cf96b;hpb=00671cf9cfbcd9ed25d79712bf01d29cb8787bf2;p=vpp.git

diff --git a/test/vpp_interface.py b/test/vpp_interface.py
index 0f798cb63e6..a464bf38984 100644
--- a/test/vpp_interface.py
+++ b/test/vpp_interface.py
@@ -1,7 +1,8 @@
+import binascii
 import socket
 from abc import abstractmethod, ABCMeta
 
-import six
+from six import moves
 
 from util import Host, mk_ll_addr, mactobinary
 
@@ -232,7 +233,7 @@ class VppInterface(object):
             if intf.sw_if_index == self.sw_if_index:
                 self._name = intf.interface_name.split(b'\0', 1)[0]
                 self._local_mac = \
-                    ':'.join(intf.l2_address.encode('hex')[i:i + 2]
+                    ':'.join(binascii.hexlify(intf.l2_address)[i:i + 2]
                              for i in range(0, 12, 2))
                 self._dump = intf
                 break
@@ -240,7 +241,7 @@ class VppInterface(object):
             raise Exception(
                 "Could not find interface with sw_if_index %d "
                 "in interface dump %s" %
-                (self.sw_if_index, six.reprlib(r)))
+                (self.sw_if_index, moves.reprlib.repr(r)))
         self._local_ip6_ll = mk_ll_addr(self.local_mac)
         self._local_ip6n_ll = socket.inet_pton(socket.AF_INET6,
                                                self.local_ip6_ll)