Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
IPsec: modify post-decrypt buf len calculation
[vpp.git]
/
test
/
test_pppoe.py
diff --git
a/test/test_pppoe.py
b/test/test_pppoe.py
index
13499a3
..
5437867
100644
(file)
--- a/
test/test_pppoe.py
+++ b/
test/test_pppoe.py
@@
-1,22
+1,17
@@
#!/usr/bin/env python
#!/usr/bin/env python
+import socket
import unittest
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.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):
class TestPPPoE(VppTestCase):
@@
-30,6
+25,10
@@
class TestPPPoE(VppTestCase):
cls.dst_ip = "100.1.1.100"
cls.dst_ipn = socket.inet_pton(socket.AF_INET, cls.dst_ip)
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 setUp(self):
super(TestPPPoE, self).setUp()
@@
-44,16
+43,17
@@
class TestPPPoE(VppTestCase):
def tearDown(self):
super(TestPPPoE, self).tearDown()
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"))
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 = []
def create_stream_pppoe_discovery(self, src_if, dst_if,
client_mac, count=1):
packets = []