X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_igmp.py;h=2403fbfd6ca7e960a57052d017bb36cd572aa286;hb=refs%2Fchanges%2F91%2F16591%2F4;hp=8f0191644bdfd53ec7a5f3aa22cd2d9094532783;hpb=947ea6222dad1ef04595c34273e9231395aef443;p=vpp.git diff --git a/test/vpp_igmp.py b/test/vpp_igmp.py index 8f0191644bd..2403fbfd6ca 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.address == socket.inet_pton(socket.AF_INET, gaddr) and \ - s.saddr.address == 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.address == socket.inet_pton(socket.AF_INET, gaddr) and \ - ev.saddr.address == 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 @@ -42,7 +40,7 @@ class IgmpSG(): for s in saddrs: ss = socket.inet_pton(socket.AF_INET, s) self.saddrs_p.append(ss) - self.saddrs_encoded.append({'address': ss}) + self.saddrs_encoded.append(ss) class IgmpRecord():