X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_teib.py;h=14688181582862c1a418c240b37e0739fe29405e;hb=8bd4db5996ba1144f659ea5341f1c2727c650bcd;hp=e117ac39302b5ac0205c60349f4fb8bbc8c88b0a;hpb=03ce46219cd0fabfd4918822c5b9fed9ef880de8;p=vpp.git diff --git a/test/vpp_teib.py b/test/vpp_teib.py index e117ac39302..14688181582 100644 --- a/test/vpp_teib.py +++ b/test/vpp_teib.py @@ -1,6 +1,6 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ - NHRP objects + TEIB objects """ from vpp_object import VppObject @@ -9,14 +9,12 @@ from vpp_object import VppObject def find_teib(test, ne): ns = test.vapi.teib_dump() for n in ns: - if ne.peer == str(n.entry.peer) \ - and ne.itf._sw_if_index == n.entry.sw_if_index: + if ne.peer == str(n.entry.peer) and ne.itf._sw_if_index == n.entry.sw_if_index: return True return False -class VppNhrp(VppObject): - +class VppTeib(VppObject): def __init__(self, test, itf, peer, nh, table_id=0): self._test = test self.table_id = table_id @@ -28,24 +26,27 @@ class VppNhrp(VppObject): r = self._test.vapi.teib_entry_add_del( is_add=1, entry={ - 'nh_table_id': self.table_id, - 'sw_if_index': self.itf.sw_if_index, - 'peer': self.peer, - 'nh': self.nh, - }) + "nh_table_id": self.table_id, + "sw_if_index": self.itf.sw_if_index, + "peer": self.peer, + "nh": self.nh, + }, + ) self._test.registry.register(self, self._test.logger) + return self def remove_vpp_config(self): r = self._test.vapi.teib_entry_add_del( is_add=0, entry={ - 'nh_table_id': self.table_id, - 'sw_if_index': self.itf.sw_if_index, - 'peer': self.peer, - }) + "nh_table_id": self.table_id, + "sw_if_index": self.itf.sw_if_index, + "peer": self.peer, + }, + ) def query_vpp_config(self): return find_teib(self._test, self) def object_id(self): - return ("teib-%s-%s" % (self.itf, self.peer)) + return "teib-%s-%s" % (self.itf, self.peer)