ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix PPPoE test case issues

Browse Source 
Change-Id: I8b57250d5578ec7979c99da15d0ed7d0b70a8872
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
This commit is contained in:
Hongjun Ni
2018-03-08 00:25:56 +08:00
committed by Neale Ranns
parent 915e3f189a
commit 2629c841c7
2 changed files with 3 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/test_pppoe.py
View File

@ -5,7 +5,7 @@ from logging import *
from framework import VppTestCase, VppTestRunner from framework import VppTestCase, VppTestRunner
from vpp_ip_route import VppIpRoute, VppRoutePath from vpp_ip_route import VppIpRoute, VppRoutePath
from vpp_pppoe_interface import VppPppoeInterface, VppPppoe6Interface from vpp_pppoe_interface import VppPppoeInterface
from vpp_papi_provider import L2_VTR_OP from vpp_papi_provider import L2_VTR_OP
from scapy.packet import Raw from scapy.packet import Raw

43
test/vpp_pppoe_interface.py
View File

@ -1,7 +1,7 @@
from vpp_interface import VppInterface from vpp_interface import VppInterface
import socket import socket
from util import ppp, ppc, mactobinary from util import mactobinary
class VppPppoeInterface(VppInterface): class VppPppoeInterface(VppInterface):
@ -12,8 +12,6 @@ class VppPppoeInterface(VppInterface):
def __init__(self, test, client_ip, client_mac, def __init__(self, test, client_ip, client_mac,
session_id, decap_vrf_id=0): session_id, decap_vrf_id=0):
""" Create VPP PPPoE4 interface """ """ Create VPP PPPoE4 interface """
self._sw_if_index = 0
super(VppPppoeInterface, self).__init__(test)
self._test = test self._test = test
self.client_ip = client_ip self.client_ip = client_ip
self.client_mac = client_mac self.client_mac = client_mac
@ -28,6 +26,7 @@ class VppPppoeInterface(VppInterface):
session_id=self.session_id, session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id) decap_vrf_id=self.decap_vrf_id)
self._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() self.generate_remote_hosts()
def remove_vpp_config(self): def remove_vpp_config(self):
@ -39,41 +38,3 @@ class VppPppoeInterface(VppInterface):
session_id=self.session_id, session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id, decap_vrf_id=self.decap_vrf_id,
is_add=0) is_add=0)
class VppPppoe6Interface(VppInterface):
"""
VPP Pppoe IPv6 interface
"""
def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, is_teb=0):
""" Create VPP PPPoE6 interface """
self._sw_if_index = 0
super(VppPppoe6Interface, self).__init__(test)
self._test = test
self.client_ip = client_ip
self.client_mac = client_mac
self.session_id = session_id
self.decap_vrf_id = decap_vrf_id
def add_vpp_config(self):
cip = socket.inet_pton(socket.AF_INET6, self.client_ip)
cmac = mactobinary(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,
is_ip6=1)
self._sw_if_index = r.sw_if_index
self.generate_remote_hosts()
def remove_vpp_config(self):
cip = socket.inet_pton(socket.AF_INET6, self.client_ip)
cmac = mactobinary(self.client_mac)
self.unconfig()
r = self.test.vapi.pppoe_add_del_session(
cip, cmac,
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id,
is_add=0,
is_ip6=1)