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

PAPI: Allow ipaddress object as argument and return values from API calls

Browse Source 
The API calls that use any of vl_api_address_t, vl_api_ip4_address,
vl_api_ip6_address_t, vl_api_prefix_t, vl_api_ip4_prefix_t,
vl_api_ip6_prefix_t now accepts either the old style dictionary,
a text string (2001:db8::/32) or an ipaddress ojbect.

Unless it is called with '_no_type_conversion':True, it will
also return an appropriate ipaddress object.

Change-Id: I84e4a1577bd57f6b5ae725f316a523988b6a955b
Signed-off-by: Ole Troan <ot@cisco.com>
This commit is contained in:
Ole Troan
2018-12-11 13:04:01 +01:00
committed by Damjan Marion
parent 41b25cf638
commit 0bcad32b38
13 changed files with 290 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/vpp_igmp.py
View File

@ -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