#!/usr/bin/env python
+import socket
import unittest
-from logging import *
-
-from framework import VppTestCase, VppTestRunner
-from vpp_ip_route import VppIpRoute, VppRoutePath
-from vpp_pppoe_interface import VppPppoeInterface, VppPppoe6Interface
-from vpp_papi_provider import L2_VTR_OP
from scapy.packet import Raw
from scapy.layers.l2 import Ether
from scapy.layers.ppp import PPPoE, PPPoED, PPP
-from scapy.layers.inet import IP, UDP
-from scapy.layers.inet6 import IPv6
-from scapy.volatile import RandMAC, RandIP
+from scapy.layers.inet import IP
-from util import ppp, ppc, mactobinary
-import socket
+from framework import VppTestCase, VppTestRunner
+from vpp_ip_route import VppIpRoute, VppRoutePath
+from vpp_pppoe_interface import VppPppoeInterface
+from util import ppp, ppc
class TestPPPoE(VppTestCase):
cls.dst_ip = "100.1.1.100"
cls.dst_ipn = socket.inet_pton(socket.AF_INET, cls.dst_ip)
+ @classmethod
+ def tearDownClass(cls):
+ super(TestPPPoE, cls).tearDownClass()
+
def setUp(self):
super(TestPPPoE, self).setUp()
def tearDown(self):
super(TestPPPoE, self).tearDown()
+ for i in self.pg_interfaces:
+ i.unconfig_ip4()
+ i.admin_down()
+
+ def show_commands_at_teardown(self):
self.logger.info(self.vapi.cli("show int"))
self.logger.info(self.vapi.cli("show pppoe fib"))
self.logger.info(self.vapi.cli("show pppoe session"))
self.logger.info(self.vapi.cli("show ip fib"))
self.logger.info(self.vapi.cli("show trace"))
- for i in self.pg_interfaces:
- i.unconfig_ip4()
- i.admin_down()
-
def create_stream_pppoe_discovery(self, src_if, dst_if,
client_mac, count=1):
packets = []
#
self.vapi.cli("clear trace")
tx2 = self.create_stream_ip4(self.pg1, self.pg0,
- self.pg0.remote_ip4, self.dst_ip)
+ self.pg0.remote_ip4, self.dst_ip, 65)
self.pg1.add_stream(tx2)
self.pg_enable_capture(self.pg_interfaces)
self.logger.info(self.vapi.cli("show pppoe fib"))
self.logger.info(self.vapi.cli("show pppoe session"))
self.logger.info(self.vapi.cli("show ip fib"))
+ self.logger.info(self.vapi.cli("show adj"))
#
# test case cleanup
# and we should still be able to use the original
#
try:
- gre_if.add_vpp_config()
+ pppoe_if.add_vpp_config()
except Exception:
pass
else:
# and we should still be able to use the original
#
try:
- gre_if.remove_vpp_config()
+ pppoe_if.remove_vpp_config()
except Exception:
pass
else: