tests: Add support for getting corefile patterns on FreeBSD

[vpp.git] / test / vpp_igmp.py

diff --git a/test/vpp_igmp.py b/test/vpp_igmp.py
index 8f01916..da2beb0 100644 (file)
--- a/test/vpp_igmp.py
+++ b/test/vpp_igmp.py
@@ -1,4 +1,3 @@
-
 from vpp_object import VppObject
 import socket
 
@@ -15,24 +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 \
-           s.gaddr.address == socket.inet_pton(socket.AF_INET, gaddr) and \
-           s.saddr.address == socket.inet_pton(socket.AF_INET, 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 \
-       ev.gaddr.address == socket.inet_pton(socket.AF_INET, gaddr) and \
-       ev.saddr.address == socket.inet_pton(socket.AF_INET, 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)
@@ -42,10 +45,10 @@ 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():
+class IgmpRecord:
     def __init__(self, sg, type):
         self.sg = sg
         self.type = type
@@ -60,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)