ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

API: Change ip4_address and ip6_address to use type alias.

Browse Source 
Change-Id: Id8669bbadd1d6b2054865a310a654e9b38d1667d
Signed-off-by: Ole Troan <ot@cisco.com>
This commit is contained in:
Ole Troan
2018-11-27 10:05:23 +01:00
committed by Ole Trøan
parent 1f0dd7a066
commit 8c8acc0278
23 changed files with 94 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/vpp_igmp.py
View File

@@ -16,8 +16,8 @@ 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):
s.gaddr == socket.inet_pton(socket.AF_INET, gaddr) and \
s.saddr == socket.inet_pton(socket.AF_INET, saddr):
return True
return False
@@ -25,8 +25,8 @@ 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 \
ev.gaddr == socket.inet_pton(socket.AF_INET, gaddr) and \
ev.saddr == socket.inet_pton(socket.AF_INET, saddr) and \
ev.filter == ff:
return True
return False
@@ -42,7 +42,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():