Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tests: multiple apidir locations
[vpp.git]
/
src
/
vpp-api
/
python
/
vpp_papi
/
vpp_papi.py
diff --git
a/src/vpp-api/python/vpp_papi/vpp_papi.py
b/src/vpp-api/python/vpp_papi/vpp_papi.py
index
6755e22
..
34d5723
100644
(file)
--- a/
src/vpp-api/python/vpp_papi/vpp_papi.py
+++ b/
src/vpp-api/python/vpp_papi/vpp_papi.py
@@
-449,7
+449,12
@@
class VPPApiClient:
if not apifiles:
# Pick up API definitions from default directory
try:
if not apifiles:
# Pick up API definitions from default directory
try:
- apifiles = VPPApiJSONFiles.find_api_files(self.apidir)
+ if isinstance(self.apidir, list):
+ apifiles = []
+ for d in self.apidir:
+ apifiles += VPPApiJSONFiles.find_api_files(d)
+ else:
+ apifiles = VPPApiJSONFiles.find_api_files(self.apidir)
except (RuntimeError, VPPApiError):
# In test mode we don't care that we can't find the API files
if testmode:
except (RuntimeError, VPPApiError):
# In test mode we don't care that we can't find the API files
if testmode: