From 3593a9174a8e9faddb8d4eb451d1b4632c1e0df1 Mon Sep 17 00:00:00 2001 From: Paul Vinciguerra Date: Thu, 28 Mar 2019 09:53:44 -0700 Subject: 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 --- test/vpp_ip_route.py | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'test/vpp_ip_route.py') diff --git a/test/vpp_ip_route.py b/test/vpp_ip_route.py index b7ceb3474d4..0bd6dd33735 100644 --- a/test/vpp_ip_route.py +++ b/test/vpp_ip_route.py @@ -143,9 +143,6 @@ class VppIpTable(VppObject): self.table_id, inet=AF_INET6 if self.is_ip6 == 1 else AF_INET) - def __str__(self): - return self.object_id() - def object_id(self): return ("table-%s-%d" % ("v6" if self.is_ip6 == 1 else "v4", @@ -178,9 +175,6 @@ class VppIpInterfaceAddress(VppObject): self.prefix.length, self.intf.sw_if_index) - def __str__(self): - return self.object_id() - def object_id(self): return "interface-ip-%s-%s" % (self.intf, self.prefix) @@ -214,9 +208,6 @@ class VppIpInterfaceBind(VppObject): self.intf.sw_if_index, self.table.is_ip6).vrf_id == self.table.table_id - def __str__(self): - return self.object_id() - def object_id(self): return "interface-bind-%s-%s" % (self.intf, self.table) @@ -453,9 +444,6 @@ class VppIpRoute(VppObject): self.table_id, inet=AF_INET6 if self.is_ip6 == 1 else AF_INET) - def __str__(self): - return self.object_id() - def object_id(self): return ("%d:%s/%d" % (self.table_id, @@ -579,9 +567,6 @@ class VppIpMRoute(VppObject): self.table_id, inet=AF_INET6 if self.is_ip6 == 1 else AF_INET) - def __str__(self): - return self.object_id() - def object_id(self): if self.is_ip6: return ("%d:(%s,%s/%d)" @@ -667,9 +652,6 @@ class VppMplsIpBind(VppObject): return True return False - def __str__(self): - return self.object_id() - def object_id(self): return ("%d:%s binds %d:%s/%d" % (self.table_id, @@ -705,9 +687,6 @@ class VppMplsTable(VppObject): return True return False - def __str__(self): - return self.object_id() - def object_id(self): return ("table-mpls-%d" % (self.table_id)) @@ -766,9 +745,6 @@ class VppMplsRoute(VppObject): return find_mpls_route(self._test, self.table_id, self.local_label, self.eos_bit) - def __str__(self): - return self.object_id() - def object_id(self): return ("%d:%s/%d" % (self.table_id, -- cgit 1.2.3-korg