PAPI: Add MACAddress object wrapper for vl_api_mac_address_t

[vpp.git] / test / test_pppoe.py

diff --git a/test/test_pppoe.py b/test/test_pppoe.py
index 0baf454..b181f6b 100644 (file)
--- 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 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
 from vpp_papi_provider import L2_VTR_OP
 
 from scapy.packet import Raw


@@ -14,8 +14,7 @@ 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, UDP
 from scapy.layers.inet6 import IPv6
 from scapy.volatile import RandMAC, RandIP

-
-from util import ppp, ppc, mactobinary
+from util import ppp, ppc

 import socket
 
 
 import socket
 
 


@@ -281,7 +280,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 +292,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 +342,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:

-            gre_if.add_vpp_config()
+            pppoe_if.add_vpp_config()

         except Exception:
             pass
         else:
         except Exception:
             pass
         else:


@@ -399,7 +399,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:

-            gre_if.remove_vpp_config()
+            pppoe_if.remove_vpp_config()

         except Exception:
             pass
         else:
         except Exception:
             pass
         else: