From: Ed Warnicke <eaw@cisco.com>
Date: Mon, 28 Nov 2016 19:59:22 +0000 (-0600)
Subject: Fix "TypeError: cannot concatenate 'str' and 'NoneType' objects"
X-Git-Tag: v17.01-rc1~163
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=b8ff5d6a1bdbd8fae07221a6d28b59c6d80fdc24;p=vpp.git

Fix "TypeError: cannot concatenate 'str' and 'NoneType' objects"

Change-Id: I85a42785d43a676b65f26b6e2cd71c997fddcbb1
Signed-off-by: Ed Warnicke <eaw@cisco.com>
---

diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 776d4a68ae8..aec052c2f40 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -93,7 +93,7 @@ class VppPapiProvider(object):
         :param cli: CLI to execute
         :returns: CLI output
         """
-        return cli + "\n" + self.cli(cli)
+        return cli + "\n" + str(self.cli(cli))
 
     def _convert_mac(self, mac):
         return int(mac.replace(":", ""), 16) << 16