From 3731f46ba2ed6edff7fd3e3c4e2434c8b445f5df Mon Sep 17 00:00:00 2001 From: Yuichi Ito Date: Thu, 12 Dec 2013 15:32:41 +0900 Subject: [PATCH] packet lib: icmp: fix reversibility about json although ICMP is using internal classes, no class is registered into '_class_prefixes'. therefore, from_jsondict() does not work correctly. this patch makes from_jsondict() to work correctly by registering internal classes into '_class_prefixes'. examination code: from ryu.lib.packet import icmp msg1 = icmp.icmp(data=icmp.echo()) print msg1 jsondict = msg1.to_jsondict() msg2 = icmp.icmp.from_jsondict(jsondict['icmp']) print msg2 print str(msg1) == str(msg2) before applying this patch: icmp(code=0,csum=0,data=echo(data=None,id=0,seq=0),type=8) icmp(code=0,csum=0,data={'echo': {'data': None, 'id': 0, 'seq': 0}},type=8) False after applying this patch: icmp(code=0,csum=0,data=echo(data=None,id=0,seq=0),type=8) icmp(code=0,csum=0,data=echo(data=None,id=0,seq=0),type=8) True Signed-off-by: Yuichi Ito Signed-off-by: FUJITA Tomonori --- ryu/lib/packet/icmp.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ryu/lib/packet/icmp.py b/ryu/lib/packet/icmp.py index a0ac1189..57b153c4 100644 --- a/ryu/lib/packet/icmp.py +++ b/ryu/lib/packet/icmp.py @@ -300,3 +300,6 @@ class TimeExceeded(stringify.StringifyMixin): if self.data is not None: length += len(self.data) return length + + +icmp.set_classes(icmp._ICMP_TYPES)