although LLDP is using internal classes, no class is registered into
'_class_prefixes'.
therefore, AssertionError occurs in from_jsondict() when the argument 'control'
was processed.
this patch makes from_jsondict() to work correctly by registering internal
classes into '_class_prefixes'.
examination code:
from ryu.lib.packet import llc
msg1 = llc.llc(dsap_addr=66, ssap_addr=66, control=llc.ControlFormatI())
print msg1
jsondict = msg1.to_jsondict()
msg2 = llc.llc.from_jsondict(jsondict['llc'])
print msg2
print str(msg1) == str(msg2)
before applying this patch:
llc(control=ControlFormatI(pf_bit=0,receive_sequence_number=0,send_sequence_number=0),dsap_addr=66,ssap_addr=66)
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/local/lib/python2.7/dist-packages/ryu/lib/stringify.py", line
293, in from_jsondict
return cls(**dict(kwargs, **additional_args))
File "/usr/local/lib/python2.7/dist-packages/ryu/lib/packet/llc.py", line
140, in __init__
assert getattr(control, 'TYPE', None) in self._CTR_TYPES
AssertionError
after applying this patch:
llc(control=ControlFormatI(pf_bit=0,receive_sequence_number=0,send_sequence_number=0),dsap_addr=66,ssap_addr=66)
llc(control=ControlFormatI(pf_bit=0,receive_sequence_number=0,send_sequence_number=0),dsap_addr=66,ssap_addr=66)
True
Signed-off-by: Yuichi Ito <[email protected]>
---
ryu/lib/packet/llc.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ryu/lib/packet/llc.py b/ryu/lib/packet/llc.py
index 12d557d..d2d5069 100644
--- a/ryu/lib/packet/llc.py
+++ b/ryu/lib/packet/llc.py
@@ -90,7 +90,6 @@ Control field
import struct
from . import bpdu
from . import packet_base
-from ryu.lib import stringify
SAP_BPDU = 0x42
@@ -167,7 +166,7 @@ class llc(packet_base.PacketBase):
@llc.register_control_type
-class ControlFormatI(stringify.StringifyMixin):
+class ControlFormatI(packet_base.StringifyMixin):
"""LLC sub encoder/decoder class for control I-format field.
An instance has the following attributes at least.
@@ -216,7 +215,7 @@ class ControlFormatI(stringify.StringifyMixin):
@llc.register_control_type
-class ControlFormatS(stringify.StringifyMixin):
+class ControlFormatS(packet_base.StringifyMixin):
"""LLC sub encoder/decoder class for control S-format field.
An instance has the following attributes at least.
@@ -268,7 +267,7 @@ class ControlFormatS(stringify.StringifyMixin):
@llc.register_control_type
-class ControlFormatU(stringify.StringifyMixin):
+class ControlFormatU(packet_base.StringifyMixin):
"""LLC sub encoder/decoder class for control U-format field.
An instance has the following attributes at least.
@@ -318,3 +317,4 @@ class ControlFormatU(stringify.StringifyMixin):
llc.register_packet_type(bpdu.bpdu, SAP_BPDU)
+llc.set_classes(llc._CTR_TYPES)
--
1.7.10.4
------------------------------------------------------------------------------
Sponsored by Intel(R) XDK
Develop, test and display web and hybrid apps with a single code base.
Download it for free now!
http://pubads.g.doubleclick.net/gampad/clk?id=111408631&iu=/4140/ostg.clktrk
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
