Revert "make test: fix broken interfaces"

[vpp.git] / test / vpp_pppoe_interface.py

diff --git a/test/vpp_pppoe_interface.py b/test/vpp_pppoe_interface.py
index 507d825..fbb78bc 100644 (file)
--- a/test/vpp_pppoe_interface.py
+++ b/test/vpp_pppoe_interface.py
@@ -12,7 +12,7 @@ class VppPppoeInterface(VppInterface):
     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
@@ -25,14 +25,15 @@ class VppPppoeInterface(VppInterface):
                 cip, cmac,
                 session_id=self.session_id,
                 decap_vrf_id=self.decap_vrf_id)
-        self.set_sw_if_index(r.sw_if_index)
+        self._sw_if_index = r.sw_if_index
+        super(VppPppoeInterface, self).__init__(self._test)
         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()
-        self.test.vapi.pppoe_add_del_session(
+        r = self.test.vapi.pppoe_add_del_session(
                 cip, cmac,
                 session_id=self.session_id,
                 decap_vrf_id=self.decap_vrf_id,