openstack
/
os-ken
Code Issues Proposed changes

Msgpack version upgrade to 1.0.0 

* Encoding parameter is removed. UTF-8 is used always. [0]
* strict_map_key is changed to False to keep the older behaviour.
  Default is changed to True in 1.0.0

Signed-off-by: Manu B <manu.b@est.tech>

[0]: https://github.com/msgpack/msgpack-python#major-breaking-changes-in-msgpack-10

Change-Id: I0e5902c4b13ab11f45f44bb9d9d9540d9630c9bb
This commit is contained in:
Manu B 2021-10-28 07:49:38 +00:00
parent dd9a42764f
commit 4468605ff6
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lower-constraints.txt
View File

@ -44,7 +44,7 @@ Mako==0.4.0
MarkupSafe==1.1.1
monotonic==0.6
mox3==0.20.0
msgpack==0.5.0
msgpack==1.0.0
munch==2.1.0
netaddr==0.7.18
netifaces==0.10.4

4
os_ken/lib/rpc.py
View File

@ -40,8 +40,8 @@ class MessageEncoder(object):
def __init__(self):
super(MessageEncoder, self).__init__()
self._packer = msgpack.Packer(encoding='utf-8', use_bin_type=True)
self._unpacker = msgpack.Unpacker(encoding='utf-8')
self._packer = msgpack.Packer(use_bin_type=True)
self._unpacker = msgpack.Unpacker(strict_map_key=False)
self._next_msgid = 0
def _create_msgid(self):

4
os_ken/services/protocols/bgp/net_ctrl.py
View File

@ -101,8 +101,8 @@ class RpcSession(Activity):
def __init__(self, sock, outgoing_msg_sink_iter):
self.peer_name = str(sock.getpeername())
super(RpcSession, self).__init__(self.NAME_FMT % self.peer_name)
self._packer = msgpack.Packer(encoding='utf-8')
self._unpacker = msgpack.Unpacker(encoding='utf-8')
self._packer = msgpack.Packer()
self._unpacker = msgpack.Unpacker(strict_map_key=False)
self._next_msgid = 0
self._socket = sock
self._outgoing_msg_sink_iter = outgoing_msg_sink_iter

2
requirements.txt
View File

@ -4,7 +4,7 @@
pbr>=2.0.0 # Apache-2.0
eventlet>=0.22.0,!=0.23.0 # MIT
msgpack>=0.5.0 # RPC library, BGP speaker(net_cntl)
msgpack>=1.0.0 # RPC library, BGP speaker(net_cntl)
netaddr>=0.7.18 # BSD
oslo.config>=5.1.0
ovs>=2.8.0 # OVSDB

2
tools/pip-requires
View File

@ -2,7 +2,7 @@
# following issue.
# https://github.com/eventlet/eventlet/issues/401
eventlet>=0.22.0,!=0.23.0
msgpack>=0.5.0 # RPC library, BGP speaker(net_cntl)
msgpack>=1.0.0 # RPC library, BGP speaker(net_cntl)
netaddr>=0.7.18
oslo.config>=5.1.0
ovs>=2.8.0 # OVSDB