Exception error occurs when NXActionUnknown parsing, because _subtype(NXActionUnknown class member variable) is not defined.
This patch fixes this problem. Signed-off-by: Minoru TAKAHASHI <[email protected]> --- ryu/ofproto/nx_actions.py | 1 + .../packet_data/of14/5-12-ofp_flow_stats_reply.packet | Bin 536 -> 552 bytes ryu/tests/packet_data_generator/src/x5.erl | 2 ++ .../json/of14/5-12-ofp_flow_stats_reply.packet.json | 13 +++++++++++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ryu/ofproto/nx_actions.py b/ryu/ofproto/nx_actions.py index 2eba31b..f0e8db8 100644 --- a/ryu/ofproto/nx_actions.py +++ b/ryu/ofproto/nx_actions.py @@ -182,6 +182,7 @@ def generate(ofp_name, ofpp_name): class NXActionUnknown(NXAction): def __init__(self, subtype, data=None, type_=None, len_=None, experimenter=None): + self._subtype = subtype super(NXActionUnknown, self).__init__() self.data = data diff --git a/ryu/tests/packet_data/of14/5-12-ofp_flow_stats_reply.packet b/ryu/tests/packet_data/of14/5-12-ofp_flow_stats_reply.packet index adc2621299da25480275751a3d6235cd8e8782a2..aa6462c5222fcc891d74143ae6a069c12baad9ed 100644 GIT binary patch delta 50 zcmV-20L}lH1gHcA1rq`&kp%4vH~;_u1jw5@cU*{(Asdqy0TcnilPm$O2><^85C8xp IAd}DmNKlUs4gdfE delta 41 xcmZ3%GJ}PMRhUU)BFkHD4F(1VmJ_qB%40evDoRflXB1)FFj<Fj&Eyx14glEP3zYx> diff --git a/ryu/tests/packet_data_generator/src/x5.erl b/ryu/tests/packet_data_generator/src/x5.erl index dae0e68..c9fa429 100644 --- a/ryu/tests/packet_data_generator/src/x5.erl +++ b/ryu/tests/packet_data_generator/src/x5.erl @@ -443,6 +443,8 @@ x() -> #ofp_action_output{port = 6, max_len = no_buffer}, #ofp_action_experimenter{experimenter = 98765432, + data = <<"exp_data">>}, + #ofp_action_experimenter{experimenter = 8992, data = <<"exp_data">>} ]}, #ofp_instruction_apply_actions{ diff --git a/ryu/tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json index 4d7e027..88d2976 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-12-ofp_flow_stats_reply.packet.json @@ -259,9 +259,18 @@ "experimenter": 98765432, "type": 65535 } + }, + { + "NXActionUnknown": { + "len": 16, + "data": "cF9kYXRh", + "experimenter": 8992, + "type": 65535, + "subtype": 25976 + } } ], - "len": 176, + "len": 192, "type": 3 } }, @@ -312,7 +321,7 @@ } } ], - "length": 296, + "length": 312, "match": { "OFPMatch": { "length": 4, -- 1.9.1 ------------------------------------------------------------------------------ Site24x7 APM Insight: Get Deep Visibility into Application Performance APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month Monitor end-to-end web transactions and take corrective actions now Troubleshoot faster and improve end-user experience. Signup Now! http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140 _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
