X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_l2.py;h=79c72e69051a6fd54cb2fc4b14fb6e2609e28494;hb=8509aa29e389bb57a7224d1ace0c55ba64db427b;hp=dc73e4238f38d162050e99ed0bfe14c94bb5f6a5;hpb=36abbf10045ba81733410f50a3f5a9463f7137d1;p=vpp.git

diff --git a/test/vpp_l2.py b/test/vpp_l2.py
index dc73e4238f3..79c72e69051 100644
--- a/test/vpp_l2.py
+++ b/test/vpp_l2.py
@@ -7,6 +7,7 @@ from vpp_object import VppObject
 from vpp_ip import VppIpAddress
 from vpp_lo_interface import VppLoInterface
 from vpp_papi import MACAddress
+from vpp_sub_interface import L2_VTR_OP
 
 
 class L2_PORT_TYPE:
@@ -93,9 +94,6 @@ class VppBridgeDomain(VppObject):
     def query_vpp_config(self):
         return find_bridge_domain(self._test, self.bd_id)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return "bridge-domain-%d" % (self.bd_id)
 
@@ -125,9 +123,6 @@ class VppBridgeDomainPort(VppObject):
                                        self.bd.bd_id,
                                        self.itf.sw_if_index)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return "BD-Port-%s-%s" % (self.bd, self.itf)
 
@@ -157,9 +152,6 @@ class VppBridgeDomainArpEntry(VppObject):
                                             self.mac.packed,
                                             self.ip.address)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return "BD-Arp-Entry-%s-%s-%s" % (self.bd, self.mac, self.ip.address)
 
@@ -203,9 +195,6 @@ class VppL2FibEntry(VppObject):
                                  self.mac.packed,
                                  self.itf.sw_if_index)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return "L2-Fib-Entry-%s-%s-%s" % (self.bd, self.mac, self.itf)
 
@@ -232,8 +221,5 @@ class VppL2Vtr(VppObject):
             return (d.vtr_op == self.op)
         return False
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return "L2-vtr-%s-%d" % (str(self.itf), self.op)