tests: refactor vpp_object.py
Move __str__ to super for all subclasses of VppObject Implement __repr__ in VppObject Implement __hash__ and __eq__ Change-Id: Ibd4ea37b84b17f499ab86630fb5b9ed9c8b4b1c2 Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
This commit is contained in:
committed by
Neale Ranns
parent
60f3e6547a
commit
3593a9174a
@@ -93,9 +93,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 +122,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 +151,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 +194,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 +220,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)
|
||||
|
||||
Reference in New Issue
Block a user