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

diff --git a/test/template_bd.py b/test/template_bd.py
index c4017616a9b..bebe76d765d 100644
--- a/test/template_bd.py
+++ b/test/template_bd.py
@@ -1,16 +1,13 @@
 #!/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, ])
 
@@ -101,7 +98,7 @@ class BridgeDomain(object):
         # 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)