X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_mpls.py;h=08cd55b7f8395b703095cb6d41fe39b9bdecd2fe;hb=7bb873a4cc068a6cc3c9d0e1d32987c5f8003904;hp=d1b1b9198c0d91b3ffd36e24df574755ffe18c1c;hpb=ad422ed7eaafe993d5b530395cb11a708f2ed922;p=vpp.git

diff --git a/test/test_mpls.py b/test/test_mpls.py
index d1b1b9198c0..08cd55b7f83 100644
--- a/test/test_mpls.py
+++ b/test/test_mpls.py
@@ -1,18 +1,18 @@
 #!/usr/bin/env python
 
 import unittest
-import socket
-from logging import *
 
 from framework import VppTestCase, VppTestRunner
 from vpp_sub_interface import VppSubInterface, VppDot1QSubint, VppDot1ADSubint
 from vpp_ip_route import IpRoute, RoutePath, MplsRoute, MplsIpBind
 
 from scapy.packet import Raw
-from scapy.layers.l2 import Ether, Dot1Q, ARP
+from scapy.layers.l2 import Ether
 from scapy.layers.inet import IP, UDP
-from scapy.layers.inet6 import ICMPv6ND_NS, IPv6, UDP
+from scapy.layers.inet6 import IPv6
 from scapy.contrib.mpls import MPLS
+from util import ppp
+
 
 
 class TestMPLS(VppTestCase):
@@ -621,8 +621,8 @@ class TestMPLS(VppTestCase):
         try:
             self.assertEqual(0, len(rx))
         except:
-            error("MPLS TTL=0 packets forwarded")
-            error(packet.show())
+            self.logger.error("MPLS TTL=0 packets forwarded")
+            self.logger.error(ppp("", rx))
             raise
 
         #