X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftemplate_bd.py;h=bebe76d765ddc74906145340b5c1291af6048bc9;hb=38071b1331b44746679997f6e66081c4936d087c;hp=b0d508fee7c6a4801b74aa75fbc32168b4e80620;hpb=3bce8ebfdfaf2a4b576012beb3516d1f4030c20c;p=vpp.git

diff --git a/test/template_bd.py b/test/template_bd.py
index b0d508fee7c..bebe76d765d 100644
--- a/test/template_bd.py
+++ b/test/template_bd.py
@@ -1,16 +1,13 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import abc
-import six
 
-from scapy.layers.l2 import Ether, Raw
+from scapy.layers.l2 import Ether
+from scapy.packet import Raw
 from scapy.layers.inet import IP, UDP
 
-from util import ip4_range
 
-
-@six.add_metaclass(abc.ABCMeta)
-class BridgeDomain(object):
+class BridgeDomain(metaclass=abc.ABCMeta):
     """ Bridge domain abstraction """
 
     @property
@@ -73,7 +70,7 @@ class BridgeDomain(object):
         """
 
         encapsulated_pkt = self.encapsulate(self.frame_request,
-                                            self.single_tunnel_bd)
+                                            self.single_tunnel_vni)
 
         self.pg0.add_stream([encapsulated_pkt, ])
 
@@ -98,10 +95,10 @@ class BridgeDomain(object):
 
         self.pg_start()
 
-        # Pick first received frame and check if it's corectly encapsulated.
+        # Pick first received frame and check if it's correctly encapsulated.
         out = self.pg0.get_capture(1)
         pkt = out[0]
-        self.check_encapsulation(pkt, self.single_tunnel_bd)
+        self.check_encapsulation(pkt, self.single_tunnel_vni)
 
         payload = self.decapsulate(pkt)
         self.assert_eq_pkts(payload, self.frame_reply)
@@ -117,7 +114,7 @@ class BridgeDomain(object):
 
         self.pg_start()
 
-        # Get packet from each tunnel and assert it's corectly encapsulated.
+        # Get packet from each tunnel and assert it's correctly encapsulated.
         out = self.pg0.get_capture(self.n_ucast_tunnels)
         for pkt in out:
             self.check_encapsulation(pkt, self.ucast_flood_bd, True)
@@ -135,7 +132,7 @@ class BridgeDomain(object):
 
         self.pg_start()
 
-        # Pick first received frame and check if it's corectly encapsulated.
+        # Pick first received frame and check if it's correctly encapsulated.
         out = self.pg0.get_capture(1)
         pkt = out[0]
         self.check_encapsulation(pkt, self.mcast_flood_bd,