From 37157dad514b85d008cf8e01a889889d8869f02b Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Thu, 1 Dec 2022 11:22:06 +0100 Subject: tests: multiple apidir locations To support testing of external plugins, add support to the test framework and PAPI for specifying a list of locations to look for api.json files. Type: improvement Signed-off-by: Ole Troan Change-Id: I128a306e3c091dc8ef994801b1470b82d2f4595d Signed-off-by: Ole Troan --- src/vpp-api/python/vpp_papi/vpp_papi.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to '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 6755e227ed1..34d57232865 100644 --- 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: - 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: -- cgit 1.2.3-korg