API: Use string type instead of u8.

[vpp.git] / test / test_pppoe.py

diff --git a/test/test_pppoe.py b/test/test_pppoe.py
index 1d0aeff..615b7a0 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,8 @@ 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 vpp_mac import mactobinary
+from util import ppp, ppc

 import socket
 
 
 import socket
 
 


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


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