X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_igmp.py;h=8f78a9b909af06bb1b0ff6f7318fd2025a855ac2;hb=288e093624515e31a8bc0f0f870e5a9c7fa2dbaa;hp=c4cbab13a0c18d9291aef34c70c4efe8c92826cf;hpb=8c8acc027871f97370ee549306876690030c3bbb;p=vpp.git diff --git a/test/vpp_igmp.py b/test/vpp_igmp.py index c4cbab13a0c..8f78a9b909a 100644 --- a/test/vpp_igmp.py +++ b/test/vpp_igmp.py @@ -16,8 +16,7 @@ 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 \ - s.gaddr == socket.inet_pton(socket.AF_INET, gaddr) and \ - s.saddr == socket.inet_pton(socket.AF_INET, saddr): + str(s.gaddr) == gaddr and str(s.saddr) == saddr: return True return False @@ -25,8 +24,7 @@ def find_igmp_state(states, itf, gaddr, saddr): 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 \ - ev.gaddr == socket.inet_pton(socket.AF_INET, gaddr) and \ - ev.saddr == socket.inet_pton(socket.AF_INET, saddr) and \ + str(ev.gaddr) == gaddr and str(ev.saddr) == saddr and \ ev.filter == ff: return True return False @@ -70,9 +68,6 @@ class VppHostState(VppObject): [], self.sg.gaddr_p) - def __str__(self): - return self.object_id() - def object_id(self): return "%s:%d" % (self.sg, self.sw_if_index)