summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/test_pppoe.py2
-rw-r--r--test/vpp_pppoe_interface.py43
2 files changed, 3 insertions, 42 deletions
diff --git a/test/test_pppoe.py b/test/test_pppoe.py
index 13499a32ec8..d69058f1aeb 100644
--- a/test/test_pppoe.py
+++ b/test/test_pppoe.py
@@ -5,7 +5,7 @@ from logging import *
from framework import VppTestCase, VppTestRunner
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 scapy.packet import Raw
diff --git a/test/vpp_pppoe_interface.py b/test/vpp_pppoe_interface.py
index 9a8b8699328..fbb78bcc55f 100644
--- a/test/vpp_pppoe_interface.py
+++ b/test/vpp_pppoe_interface.py
@@ -1,7 +1,7 @@
from vpp_interface import VppInterface
import socket
-from util import ppp, ppc, mactobinary
+from util import mactobinary
class VppPppoeInterface(VppInterface):
@@ -12,8 +12,6 @@ class VppPppoeInterface(VppInterface):
def __init__(self, test, client_ip, client_mac,
session_id, decap_vrf_id=0):
""" Create VPP PPPoE4 interface """
- self._sw_if_index = 0
- super(VppPppoeInterface, self).__init__(test)
self._test = test
self.client_ip = client_ip
self.client_mac = client_mac
@@ -28,6 +26,7 @@ class VppPppoeInterface(VppInterface):
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.generate_remote_hosts()
def remove_vpp_config(self):
@@ -39,41 +38,3 @@ class VppPppoeInterface(VppInterface):
session_id=self.session_id,
decap_vrf_id=self.decap_vrf_id,
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)