Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
GBP: fixes for l3-out routing
[vpp.git]
/
test
/
test_pppoe.py
diff --git
a/test/test_pppoe.py
b/test/test_pppoe.py
index
0baf454
..
b6a1eef
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):
@@
-281,7
+276,7
@@
class TestPPPoE(VppTestCase):
#
self.vapi.cli("clear trace")
tx2 = self.create_stream_ip4(self.pg1, self.pg0,
#
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.pg1.add_stream(tx2)
self.pg_enable_capture(self.pg_interfaces)
@@
-293,6
+288,7
@@
class TestPPPoE(VppTestCase):
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 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
#
# test case cleanup
@@
-342,7
+338,7
@@
class TestPPPoE(VppTestCase):
# and we should still be able to use the original
#
try:
# and we should still be able to use the original
#
try:
-
gr
e_if.add_vpp_config()
+
pppo
e_if.add_vpp_config()
except Exception:
pass
else:
except Exception:
pass
else:
@@
-399,7
+395,7
@@
class TestPPPoE(VppTestCase):
# and we should still be able to use the original
#
try:
# and we should still be able to use the original
#
try:
-
gr
e_if.remove_vpp_config()
+
pppo
e_if.remove_vpp_config()
except Exception:
pass
else:
except Exception:
pass
else: