vppinfra: Improve code portability

[vpp.git] / test / test_gre.py

diff --git a/test/test_gre.py b/test/test_gre.py
index a79819e..763fb9d 100644 (file)
--- a/test/test_gre.py
+++ b/test/test_gre.py
@@ -9,8 +9,8 @@ from scapy.layers.inet import IP, UDP
 from scapy.layers.inet6 import IPv6
 from scapy.volatile import RandMAC, RandIP
 
-from framework import tag_fixme_vpp_workers
-from framework import VppTestCase, VppTestRunner
+from framework import VppTestCase
+from asfframework import VppTestRunner, tag_fixme_vpp_workers
 from vpp_sub_interface import L2_VTR_OP, VppDot1QSubint
 from vpp_gre_interface import VppGreInterface
 from vpp_teib import VppTeib
@@ -19,7 +19,6 @@ from vpp_ip_route import (
     VppIpRoute,
     VppRoutePath,
     VppIpTable,
-    FibPathProto,
     VppMplsLabel,
 )
 from vpp_mpls_tunnel_interface import VppMPLSTunnelInterface
@@ -58,7 +57,7 @@ class TestGREInputNodes(VppTestCase):
         self.pg0.add_stream(pkt)
         self.pg_start()
         # no tunnel created, gre-input not registered
-        err = self.statistics.get_counter("/err/ip4-local/unknown ip protocol")[0]
+        err = self.statistics.get_counter("/err/ip4-local/unknown_protocol")[0]
         self.assertEqual(err, 1)
         err_count = err
 
@@ -69,7 +68,7 @@ class TestGREInputNodes(VppTestCase):
         self.pg0.add_stream(pkt)
         self.pg_start()
         # tunnel created, gre-input registered
-        err = self.statistics.get_counter("/err/ip4-local/unknown ip protocol")[0]
+        err = self.statistics.get_counter("/err/ip4-local/unknown_protocol")[0]
         # expect no new errors
         self.assertEqual(err, err_count)
 
@@ -240,7 +239,6 @@ class TestGRE(VppTestCase):
     def verify_tunneled_4o4(
         self, src_if, capture, sent, tunnel_src, tunnel_dst, dscp=0, ecn=0
     ):
-
         self.assertEqual(len(capture), len(sent))
         tos = (dscp << 2) | ecn
 
@@ -273,7 +271,6 @@ class TestGRE(VppTestCase):
     def verify_tunneled_6o6(
         self, src_if, capture, sent, tunnel_src, tunnel_dst, dscp=0, ecn=0
     ):
-
         self.assertEqual(len(capture), len(sent))
         tc = (dscp << 2) | ecn
 
@@ -304,7 +301,6 @@ class TestGRE(VppTestCase):
                 raise
 
     def verify_tunneled_4o6(self, src_if, capture, sent, tunnel_src, tunnel_dst):
-
         self.assertEqual(len(capture), len(sent))
 
         for i in range(len(capture)):
@@ -333,7 +329,6 @@ class TestGRE(VppTestCase):
                 raise
 
     def verify_tunneled_6o4(self, src_if, capture, sent, tunnel_src, tunnel_dst):
-
         self.assertEqual(len(capture), len(sent))
 
         for i in range(len(capture)):