X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_interface.py;h=32d8166fc43beb987c308d509beb6440dc3e217a;hb=4a58e49cf;hp=a344ec613b016ae1f1279f674dc3762f0cf0ac30;hpb=207083f59524a8523e7c4ab4eeff3cbc7b21c6a0;p=vpp.git

diff --git a/test/vpp_interface.py b/test/vpp_interface.py
index a344ec613b0..32d8166fc43 100644
--- a/test/vpp_interface.py
+++ b/test/vpp_interface.py
@@ -2,9 +2,6 @@ import binascii
 import socket
 import abc
 
-import six
-from six import moves
-
 from util import Host, mk_ll_addr
 from vpp_papi import mac_ntop, VppEnum
 from ipaddress import IPv4Network, IPv6Network
@@ -15,8 +12,7 @@ except NameError:
     text_type = str
 
 
-@six.add_metaclass(abc.ABCMeta)
-class VppInterface(object):
+class VppInterface(metaclass=abc.ABCMeta):
     """Generic VPP interface."""
 
     @property
@@ -65,23 +61,11 @@ class VppInterface(object):
         """Local IPv4 prefix """
         return ("%s/%d" % (self._local_ip4, self._local_ip4_len))
 
-    @property
-    def local_ip4n(self):
-        """DEPRECATED """
-        """Local IPv4 address - raw, suitable as API parameter."""
-        return socket.inet_pton(socket.AF_INET, self._local_ip4)
-
     @property
     def remote_ip4(self):
         """IPv4 address of remote peer "connected" to this interface."""
         return self._remote_hosts[0].ip4
 
-    @property
-    def remote_ip4n(self):
-        """DEPRECATED """
-        """Local IPv6 address - raw, suitable as API parameter."""
-        return socket.inet_pton(socket.AF_INET, self._remote_hosts[0].ip4)
-
     @property
     def local_ip6(self):
         """Local IPv6 address on VPP interface (string)."""
@@ -105,46 +89,22 @@ class VppInterface(object):
         """Local IPv4 prefix """
         return ("%s/%d" % (self._local_ip6, self._local_ip6_len))
 
-    @property
-    def local_ip6n(self):
-        """DEPRECATED """
-        """Local IPv6 address - raw, suitable as API parameter."""
-        return socket.inet_pton(socket.AF_INET6, self._local_ip6)
-
     @property
     def remote_ip6(self):
         """IPv6 address of remote peer "connected" to this interface."""
         return self._remote_hosts[0].ip6
 
-    @property
-    def remote_ip6n(self):
-        """DEPRECATED """
-        """Local IPv6 address - raw, suitable as API parameter."""
-        return socket.inet_pton(socket.AF_INET6, self._remote_hosts[0].ip6)
-
     @property
     def local_ip6_ll(self):
         """Local IPv6 link-local address on VPP interface (string)."""
         return self._local_ip6_ll
 
-    @property
-    def local_ip6n_ll(self):
-        """DEPRECATED """
-        """Local IPv6 link-local address on VPP interface (string)."""
-        return socket.inet_pton(socket.AF_INET6, self._local_ip6_ll.address)
-
     @property
     def remote_ip6_ll(self):
         """Link-local IPv6 address of remote peer
         "connected" to this interface."""
         return self._remote_ip6_ll
 
-    @property
-    def remote_ip6n_ll(self):
-        """DEPRECATED """
-        """Local IPv6 link-local address on VPP interface (string)."""
-        return socket.inet_pton(socket.AF_INET6, self._remote_ip6_ll)
-
     @property
     def name(self):
         """Name of the interface."""
@@ -474,8 +434,8 @@ class VppInterface(object):
     def set_proxy_arp(self, enable=1):
         """ Set the interface to enable/disable Proxy ARP """
         self.test.vapi.proxy_arp_intfc_enable_disable(
-            self.sw_if_index,
-            enable)
+            sw_if_index=self.sw_if_index,
+            enable=enable)
         return self
 
     def query_vpp_config(self):