X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_pppoe_interface.py;h=0d5516eab603e9e2c132bad0f210becf93183830;hb=e8fb3cfe892ca1c562d63eb8854386180a297d80;hp=fbb78bcc55f200806554b0e0c3c65bd7cb2296e2;hpb=c8efa29b6f9a91381897b54f1147daf922ed7164;p=vpp.git

diff --git a/test/vpp_pppoe_interface.py b/test/vpp_pppoe_interface.py
index fbb78bcc55f..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 mactobinary
+from vpp_papi import mac_pton
 
 
 class VppPppoeInterface(VppInterface):
@@ -9,32 +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._test = test
+    def __init__(self, test, client_ip, client_mac, session_id, decap_vrf_id=0):
+        """Create VPP PPPoE4 interface"""
+        super(VppPppoeInterface, self).__init__(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
-        super(VppPppoeInterface, self).__init__(self._test)
+            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)
+        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)