X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_igmp.py;h=da2beb0605da9e12d580ebcbb0a18c0966d00edc;hb=d9b0c6fbf7aa5bd9af84264105b39c82028a4a29;hp=2403fbfd6ca7e960a57052d017bb36cd572aa286;hpb=0bcad32b3870f9998fa1393418081cdda685272f;p=vpp.git diff --git a/test/vpp_igmp.py b/test/vpp_igmp.py index 2403fbfd6ca..da2beb0605d 100644 --- a/test/vpp_igmp.py +++ b/test/vpp_igmp.py @@ -1,4 +1,3 @@ - from vpp_object import VppObject import socket @@ -15,22 +14,28 @@ class IGMP_FILTER: def find_igmp_state(states, itf, gaddr, saddr): for s in states: - if s.sw_if_index == itf.sw_if_index and \ - str(s.gaddr) == gaddr and str(s.saddr) == saddr: + if ( + s.sw_if_index == itf.sw_if_index + and str(s.gaddr) == gaddr + and str(s.saddr) == saddr + ): return True return False def wait_for_igmp_event(test, timeout, itf, gaddr, saddr, ff): ev = test.vapi.wait_for_event(timeout, "igmp_event") - if ev.sw_if_index == itf.sw_if_index and \ - str(ev.gaddr) == gaddr and str(ev.saddr) == saddr and \ - ev.filter == ff: + if ( + ev.sw_if_index == itf.sw_if_index + and str(ev.gaddr) == gaddr + and str(ev.saddr) == saddr + and ev.filter == ff + ): return True return False -class IgmpSG(): +class IgmpSG: def __init__(self, gaddr, saddrs): self.gaddr = gaddr self.gaddr_p = socket.inet_pton(socket.AF_INET, gaddr) @@ -43,7 +48,7 @@ class IgmpSG(): self.saddrs_encoded.append(ss) -class IgmpRecord(): +class IgmpRecord: def __init__(self, sg, type): self.sg = sg self.type = type @@ -58,18 +63,11 @@ class VppHostState(VppObject): def add_vpp_config(self): self._test.vapi.igmp_listen( - self.filter, self.sw_if_index, - self.sg.saddrs_encoded, self.sg.gaddr_p) + self.filter, self.sw_if_index, self.sg.saddrs_encoded, self.sg.gaddr_p + ) def remove_vpp_config(self): - self._test.vapi.igmp_listen( - self.filter, - self.sw_if_index, - [], - self.sg.gaddr_p) - - def __str__(self): - return self.object_id() + self._test.vapi.igmp_listen(self.filter, self.sw_if_index, [], self.sg.gaddr_p) def object_id(self): return "%s:%d" % (self.sg, self.sw_if_index)