X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=test%2Fvpp_devices.py;h=cff08e844353fae7df65d41e487f8936703a8240;hb=d9b0c6fbf7aa5bd9af84264105b39c82028a4a29;hp=7e18eca65a9b95a715d5746b66389d1abb38820c;hpb=5de4fb7076a46ab75e2d3c30079dd6639af16a86;p=vpp.git diff --git a/test/vpp_devices.py b/test/vpp_devices.py index 7e18eca65a9..cff08e84435 100644 --- a/test/vpp_devices.py +++ b/test/vpp_devices.py @@ -2,29 +2,26 @@ from vpp_interface import VppInterface class VppTAPInterface(VppInterface): - @property def tap_id(self): """TAP id""" return self._tap_id - def __init__(self, test, tap_id=0xffffffff, mac_addr=None): + def __init__(self, test, tap_id=0xFFFFFFFF, mac_addr=None): self._test = test self._tap_id = tap_id self._mac_addr = mac_addr def get_vpp_dump(self): - dump = self._test.vapi.sw_interface_tap_v2_dump() - for entry in dump: - if entry.sw_if_index == self.sw_if_index: - return entry + dump = self._test.vapi.sw_interface_tap_v2_dump(sw_if_index=self.sw_if_index) + return dump def add_vpp_config(self): - use_random_mac = True if self._mac_addr else False reply = self._test.vapi.tap_create_v2( id=self._tap_id, - use_random_mac=use_random_mac, - mac_address=self._mac_addr) + use_random_mac=bool(self._mac_addr), + mac_address=self._mac_addr, + ) self.set_sw_if_index(reply.sw_if_index) self._test.registry.register(self, self.test.logger) @@ -33,9 +30,7 @@ class VppTAPInterface(VppInterface): def query_vpp_config(self): dump = self.get_vpp_dump() - if dump: - return True - return False + return bool(dump) def object_id(self): return "tap-%s" % self._tap_id