X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_pppoe_interface.py;h=0d5516eab603e9e2c132bad0f210becf93183830;hb=4941afb4f96a20df7dc8b6688f7921a3d713b77d;hp=9a8b8699328ef92a7dd17d55b114aecb1cb32d31;hpb=62f9cdd82c52dc05cb89a742d21aba013ce526d4;p=vpp.git

diff --git a/test/vpp_pppoe_interface.py b/test/vpp_pppoe_interface.py
index 9a8b8699328..0d5516eab60 100644
--- a/test/vpp_pppoe_interface.py
+++ b/test/vpp_pppoe_interface.py
@@ -1,7 +1,6 @@
-
 from vpp_interface import VppInterface
 import socket
-from util import ppp, ppc, mactobinary
+from vpp_papi import mac_pton
 
 
 class VppPppoeInterface(VppInterface):
@@ -9,71 +8,35 @@ class VppPppoeInterface(VppInterface):
     VPP Pppoe interface
     """
 
-    def __init__(self, test, client_ip, client_mac,
-                 session_id, decap_vrf_id=0):
-        """ Create VPP PPPoE4 interface """
-        self._sw_if_index = 0
+    def __init__(self, test, client_ip, client_mac, session_id, decap_vrf_id=0):
+        """Create VPP PPPoE4 interface"""
         super(VppPppoeInterface, self).__init__(test)
-        self._test = test
         self.client_ip = client_ip
         self.client_mac = client_mac
         self.session_id = session_id
         self.decap_vrf_id = decap_vrf_id
+        self.vpp_sw_if_index = -1
 
     def add_vpp_config(self):
-        cip = socket.inet_pton(socket.AF_INET, self.client_ip)
-        cmac = mactobinary(self.client_mac)
         r = self.test.vapi.pppoe_add_del_session(
-                cip, cmac,
-                session_id=self.session_id,
-                decap_vrf_id=self.decap_vrf_id)
-        self._sw_if_index = r.sw_if_index
+            self.client_ip,
+            self.client_mac,
+            session_id=self.session_id,
+            decap_vrf_id=self.decap_vrf_id,
+        )
+        self.set_sw_if_index(r.sw_if_index)
+        self.vpp_sw_if_index = r.sw_if_index
         self.generate_remote_hosts()
 
     def remove_vpp_config(self):
-        cip = socket.inet_pton(socket.AF_INET, self.client_ip)
-        cmac = mactobinary(self.client_mac)
         self.unconfig()
-        r = self.test.vapi.pppoe_add_del_session(
-                cip, cmac,
-                session_id=self.session_id,
-                decap_vrf_id=self.decap_vrf_id,
-                is_add=0)
-
-
-class VppPppoe6Interface(VppInterface):
-    """
-    VPP Pppoe IPv6 interface
-    """
-
-    def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, is_teb=0):
-        """ Create VPP PPPoE6 interface """
-        self._sw_if_index = 0
-        super(VppPppoe6Interface, self).__init__(test)
-        self._test = test
-        self.client_ip = client_ip
-        self.client_mac = client_mac
-        self.session_id = session_id
-        self.decap_vrf_id = decap_vrf_id
-
-    def add_vpp_config(self):
-        cip = socket.inet_pton(socket.AF_INET6, self.client_ip)
-        cmac = mactobinary(self.client_mac)
-        r = self.test.vapi.pppoe_add_del_session(
-                cip, cmac,
-                session_id=self.session_id,
-                decap_vrf_id=self.decap_vrf_id,
-                is_ip6=1)
-        self._sw_if_index = r.sw_if_index
-        self.generate_remote_hosts()
-
-    def remove_vpp_config(self):
-        cip = socket.inet_pton(socket.AF_INET6, self.client_ip)
-        cmac = mactobinary(self.client_mac)
-        self.unconfig()
-        r = self.test.vapi.pppoe_add_del_session(
-                cip, cmac,
-                session_id=self.session_id,
-                decap_vrf_id=self.decap_vrf_id,
-                is_add=0,
-                is_ip6=1)
+        self.test.vapi.pppoe_add_del_session(
+            self.client_ip,
+            self.client_mac,
+            session_id=self.session_id,
+            decap_vrf_id=self.decap_vrf_id,
+            is_add=0,
+        )
+
+    def set_unnumbered(self, swif_iface):
+        self.test.vapi.sw_interface_set_unnumbered(swif_iface, self.vpp_sw_if_index)