From: Paul Vinciguerra <pvinci@vinciconsulting.com>
Date: Sun, 13 Jan 2019 18:26:05 +0000 (-0800)
Subject: VTL: vpp_papi_provider: Don't shortcircuit vpp_papi jasonfile detection.
X-Git-Tag: v19.04-rc0~6
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F92%2F16792%2F3;p=vpp.git

VTL: vpp_papi_provider: Don't shortcircuit vpp_papi jasonfile detection.

The detection login in vpp_papi is significantly more advanced than
the implementation in vpp_papi_provider.

Let's take full advantage of it and ensure consistent behavior.

Change-Id: I786e6d5f4588a0d74e863cce1b0bc1a93fa0e614
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
---

diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 584fe191a1b..1ca9a89a2ea 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -75,14 +75,14 @@ class VppPapiProvider(object):
         self.test_class = test_class
         self._expect_api_retval = self._zero
         self._expect_stack = []
-        jsonfiles = []
 
         install_dir = os.getenv('VPP_INSTALL_PATH')
-        for root, dirnames, filenames in os.walk(install_dir):
-            for filename in fnmatch.filter(filenames, '*.api.json'):
-                jsonfiles.append(os.path.join(root, filename))
 
-        self.vpp = VPP(jsonfiles, logger=test_class.logger,
+        # Vapi requires 'VPP_API_DIR', not set when run from Makefile.
+        if 'VPP_API_DIR' not in os.environ:
+            os.environ['VPP_API_DIR'] = os.getenv('VPP_INSTALL_PATH')
+
+        self.vpp = VPP(logger=test_class.logger,
                        read_timeout=read_timeout)
         self._events = deque()