ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: set object_id for routes.

Browse Source 
Object id's are used as keys in the object repository.
They need to be unique.

Also useful for debugging in log.txt.

Type: test

Change-Id: I69b5f3a7508918a5780ff8f20d27d4a3c34a5699
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
This commit is contained in:
Paul Vinciguerra
2019-06-18 07:57:53 -04:00
committed by Neale Ranns
parent a608afeec3
commit 941da4a224
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/vpp_ip_route.py
View File

@ -149,6 +149,7 @@ def fib_interface_ip_prefix(test, address, length, sw_if_index):
prefix = IPv6Network("%s/%d" % (text_type(address), length), prefix = IPv6Network("%s/%d" % (text_type(address), length),
strict=False) strict=False)
# TODO: refactor this to VppIpPrefix.__eq__
for a in addrs: for a in addrs:
if a.sw_if_index == sw_if_index and \ if a.sw_if_index == sw_if_index and \
a.prefix == prefix: a.prefix == prefix:
@ -426,6 +427,7 @@ class VppIpRoute(VppObject):
self.table_id = table_id self.table_id = table_id
self.prefix = VppIpPrefix(dest_addr, dest_addr_len) self.prefix = VppIpPrefix(dest_addr, dest_addr_len)
self.register = register self.register = register
self.stats_index = None
self.encoded_paths = [] self.encoded_paths = []
for path in self.paths: for path in self.paths:
@ -482,10 +484,11 @@ class VppIpRoute(VppObject):
self.table_id) self.table_id)
def object_id(self): def object_id(self):
return ("%d:%s/%d" return ("%s:table-%d-%s/%d" % (
% (self.table_id, 'ip6-route' if self.prefix.addr.version == 6 else 'ip-route',
self.prefix.address, self.table_id,
self.prefix.len)) self.prefix.address,
self.prefix.len))
def get_stats_to(self): def get_stats_to(self):
c = self._test.statistics.get_counter("/net/route/to") c = self._test.statistics.get_counter("/net/route/to")
@ -721,7 +724,7 @@ class VppMplsRoute(VppObject):
self.local_label, self.eos_bit) self.local_label, self.eos_bit)
def object_id(self): def object_id(self):
return ("%d:%s/%d" return ("mpls-route-%d:%s/%d"
% (self.table_id, % (self.table_id,
self.local_label, self.local_label,
20 + self.eos_bit)) 20 + self.eos_bit))