From 45d5c87d86d8ac5268e08f743eb032f5a66a82f8 Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Tue, 18 Sep 2018 10:23:01 +0200 Subject: STATS: Add Python 3 support to vpp_stats.py. Change-Id: Iad0b0315fbd493b67e6ca490206ec8e8422790ea Signed-off-by: Ole Troan --- src/vpp-api/python/setup.py | 2 +- src/vpp-api/python/vpp_papi/vpp_stats.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/vpp-api/python') diff --git a/src/vpp-api/python/setup.py b/src/vpp-api/python/setup.py index 0d8c149679e..a719d10df28 100644 --- a/src/vpp-api/python/setup.py +++ b/src/vpp-api/python/setup.py @@ -18,7 +18,7 @@ except ImportError: from distutils.core import setup, find_packages setup(name='vpp_papi', - version='1.6.1', + version='1.6.2', description='VPP Python binding', author='Ole Troan', author_email='ot@cisco.com', diff --git a/src/vpp-api/python/vpp_papi/vpp_stats.py b/src/vpp-api/python/vpp_papi/vpp_stats.py index 9bdb79f5178..ecd734bbf7d 100644 --- a/src/vpp-api/python/vpp_papi/vpp_stats.py +++ b/src/vpp-api/python/vpp_papi/vpp_stats.py @@ -62,7 +62,7 @@ def make_string_vector(api, strings): if type(strings) is not list: strings = [strings] for s in strings: - vec = api.stat_segment_string_vector(vec, ffi.new("char []", s)) + vec = api.stat_segment_string_vector(vec, ffi.new("char []", s.encode())) return vec @@ -114,7 +114,7 @@ def stat_entry_to_python(api, e): class VPPStats: def __init__(self, socketname='/var/run/stats.sock'): self.api = ffi.dlopen('libvppapiclient.so') - rv = self.api.stat_segment_connect(socketname) + rv = self.api.stat_segment_connect(socketname.encode()) if rv != 0: raise IOError() @@ -129,7 +129,7 @@ class VPPStats: rv = self.api.stat_segment_dump(counters) rv_len = self.api.stat_segment_vec_len(rv) for i in range(rv_len): - n = ffi.string(rv[i].name) + n = ffi.string(rv[i].name).decode() e = stat_entry_to_python(self.api, rv[i]) stats[n] = e return stats -- cgit 1.2.3-korg