From c8efa29b6f9a91381897b54f1147daf922ed7164 Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Fri, 22 Jun 2018 22:33:41 +0200 Subject: Revert "make test: fix broken interfaces" This reverts commit d5c60b96a3fd93916fc4af5c8d6d25625c28242e. Change-Id: I3632b9c3f76c615aee897f28f76d094e7031e689 Signed-off-by: Ole Troan --- test/vpp_pppoe_interface.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'test/vpp_pppoe_interface.py') diff --git a/test/vpp_pppoe_interface.py b/test/vpp_pppoe_interface.py index 507d8251442..fbb78bcc55f 100644 --- 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, -- cgit 1.2.3-korg