diff --git a/lower-constraints.txt b/lower-constraints.txt index 3313b71a..52a68d42 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -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 diff --git a/os_ken/lib/rpc.py b/os_ken/lib/rpc.py index 7db0ebeb..d0691d63 100644 --- a/os_ken/lib/rpc.py +++ b/os_ken/lib/rpc.py @@ -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): diff --git a/os_ken/services/protocols/bgp/net_ctrl.py b/os_ken/services/protocols/bgp/net_ctrl.py index 96e06646..154dad6b 100644 --- a/os_ken/services/protocols/bgp/net_ctrl.py +++ b/os_ken/services/protocols/bgp/net_ctrl.py @@ -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 diff --git a/requirements.txt b/requirements.txt index e1f54929..4b4de591 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 diff --git a/tools/pip-requires b/tools/pip-requires index cf1eb152..fd952ee3 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -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