X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_pppoe_interface.py;h=0d5516eab603e9e2c132bad0f210becf93183830;hb=0f4febfac3ed95a384778fc25e5223062acdf0a9;hp=9be92327dcf550efd1ccc1a5b07703254c35dc55;hpb=8006c6aa425126529b4017768a9201e4f03964ad;p=vpp.git diff --git a/test/vpp_pppoe_interface.py b/test/vpp_pppoe_interface.py index 9be92327dcf..0d5516eab60 100644 --- a/test/vpp_pppoe_interface.py +++ b/test/vpp_pppoe_interface.py @@ -1,4 +1,3 @@ - from vpp_interface import VppInterface import socket from vpp_papi import mac_pton @@ -9,31 +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 """ + 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 = mac_pton(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.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 = mac_pton(self.client_mac) self.unconfig() 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.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)