Revert "Revert "make test: fix broken interfaces""

This reverts commit c8efa29b6f.

Change-Id: I1d5c5773d5f86a63073e255336bd9de628e26179
Signed-off-by: Klement Sekera <ksekera@cisco.com>
This commit is contained in:
Klement Sekera
2018-06-24 22:49:33 +02:00
parent 31da2e3031
commit b9ef2739dd
23 changed files with 61 additions and 86 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 """
self._test = test
super(VppPppoeInterface, self).__init__(test)
self.client_ip = client_ip
self.client_mac = client_mac
self.session_id = session_id
@ -25,15 +25,14 @@ class VppPppoeInterface(VppInterface):
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.set_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(
self.test.vapi.pppoe_add_del_session(
cip, cmac,
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id,