summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-05-16 23:27:11 +0000
committerGerrit Code Review <review@openstack.org>2018-05-16 23:27:11 +0000
commit37bf4889ba8713f12c97cdb3f8246ad39555b047 (patch)
tree391cf6fd01d6b742aea10e25e1cd3a2a24042351
parent87b909543f87a765f3902175a0c68acabd93e816 (diff)
parentec0760a40e68f921e482d77a01551f7f4e0e3788 (diff)
Merge "py3: Fix list_entries for netlink_lib"
-rw-r--r--neutron/privileged/agent/linux/netlink_lib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/neutron/privileged/agent/linux/netlink_lib.py b/neutron/privileged/agent/linux/netlink_lib.py
index df0c22e..ac8e364 100644
--- a/neutron/privileged/agent/linux/netlink_lib.py
+++ b/neutron/privileged/agent/linux/netlink_lib.py
@@ -139,7 +139,7 @@ class ConntrackManager(object):
139 conntrack, type_, 139 conntrack, type_,
140 nl_constants.NFCT_O_PLAIN, 140 nl_constants.NFCT_O_PLAIN,
141 nl_constants.NFCT_OF_TIME) 141 nl_constants.NFCT_OF_TIME)
142 entries.append(raw_entry.value) 142 entries.append(raw_entry.value.decode('utf-8'))
143 return nl_constants.NFCT_CB_CONTINUE 143 return nl_constants.NFCT_CB_CONTINUE
144 144
145 self._callback_register(nl_constants.NFCT_T_ALL, 145 self._callback_register(nl_constants.NFCT_T_ALL,