Revert "make test: fix broken interfaces"

This reverts commit d5c60b96a3.

Change-Id: I3632b9c3f76c615aee897f28f76d094e7031e689
Signed-off-by: Ole Troan <ot@cisco.com>
This commit is contained in:
Ole Troan
2018-06-22 22:33:41 +02:00
parent d5c60b96a3
commit c8efa29b6f
23 changed files with 86 additions and 61 deletions

View File

@ -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,