changes from the previous: - rebase again YAMAMOTO Takashi (36): of12: some "len" "type" attributes visible to user of12: update *.json after "len" "type" changes test_parser_v12: update after "len" changes of12: make OFPQueuePropHeader.property visible to user test_parser_v12: update after OFPQueuePropHeader.property change of12: update *.json after OFPQueuePropHeader.property change of12: make OFPMatch "type" and "length" visible to users of12: update *.json after OFPMatch "type" and "length" changes of12: make OFPErrorExperimenterMsg.type visible to users of12: update *.json after OFPErrorExperimenterMsg.type changes test_parser_v12: update after OFPErrorExperimenterMsg.type changes of12: make OFPPacketOut.actions_len visible to users of12: update *.json after OFPPacketOut.actions_len changes test_parser_v12: update after OFPPacketOut.actions_len changes of12: make OFPStatsReply.type visible to users of12: update *.json after OFPStatsReply.type changes of12: make OFPxxxStats.length visible to users of12: update *.json after OFPxxxStats.length changes test_parser_v12: update after OFPxxxStats.length changes of13: some "len" "type" attributes visible to user of13: update *.json after "len" "type" changes of13: make OFPQueuePropHeader.property visible to user of13: update *.json after OFPQueuePropHeader.property change of13: make OFPMatch "type" and "length" visible to users of13: update *.json after OFPMatch "type" and "length" changes of13: make OFPPacketOut.actions_len visible to users of13: update *.json after OFPPacketOut.actions_len changes of13: make multipart request/reply's "type" visible to users of13: update *.json after multipart request/reply's "type" changes of13: make OFPxxxStats.length visible to users of13: update *.json after OFPxxxStats.length changes of13: make OFPHelloElemVersionBitmap's "type" and "length" to users of13: update *.json after OFPHelloElemVersionBitmap changes of13: make OFPMeterBand's "type" and "len" visible to users of13: update after OFPMeterBand changes test_parser: ensure that "len" "length" fields can be omitted
ryu/ofproto/ofproto_v1_2_parser.py | 149 ++++++------ ryu/ofproto/ofproto_v1_3_parser.py | 264 +++++++++++---------- .../json/of12/3-0-ofp_desc_stats_reply.packet.json | 3 +- .../json/of12/3-1-ofp_packet_out.packet.json | 5 +- .../of12/3-11-ofp_flow_stats_request.packet.json | 4 +- .../of12/3-12-ofp_flow_stats_reply.packet.json | 37 ++- .../ofproto/json/of12/3-2-ofp_flow_mod.packet.json | 9 +- .../json/of12/3-21-ofp_group_mod.packet.json | 5 +- .../3-25-ofp_aggregate_stats_request.packet.json | 4 +- .../3-26-ofp_aggregate_stats_reply.packet.json | 3 +- .../of12/3-28-ofp_table_stats_reply.packet.json | 3 +- .../ofproto/json/of12/3-3-ofp_flow_mod.packet.json | 8 +- .../of12/3-30-ofp_port_stats_reply.packet.json | 3 +- ...3-32-ofp_group_features_stats_reply.packet.json | 4 +- .../3-34-ofp_group_desc_stats_reply.packet.json | 9 +- .../3-36-ofp_queue_get_config_reply.packet.json | 10 + .../of12/3-38-ofp_queue_stats_reply.packet.json | 3 +- .../json/of12/3-4-ofp_packet_in.packet.json | 4 +- .../json/of12/3-40-ofp_flow_removed.packet.json | 4 +- .../3-41-ofp_error_msg_experimenter.packet.json | 3 +- .../json/of13/4-0-ofp_desc_reply.packet.json | 3 +- .../json/of13/4-1-ofp_packet_out.packet.json | 5 +- .../ofproto/json/of13/4-10-ofp_hello.packet.json | 2 + .../of13/4-11-ofp_flow_stats_request.packet.json | 7 +- .../of13/4-12-ofp_flow_stats_reply.packet.json | 37 ++- .../ofproto/json/of13/4-2-ofp_flow_mod.packet.json | 9 +- .../json/of13/4-21-ofp_group_mod.packet.json | 5 +- .../json/of13/4-24-ofp_desc_request.packet.json | 3 +- .../4-25-ofp_aggregate_stats_request.packet.json | 7 +- .../4-26-ofp_aggregate_stats_reply.packet.json | 3 +- .../of13/4-27-ofp_table_stats_request.packet.json | 3 +- .../of13/4-28-ofp_table_stats_reply.packet.json | 3 +- .../of13/4-29-ofp_port_stats_request.packet.json | 3 +- .../ofproto/json/of13/4-3-ofp_flow_mod.packet.json | 8 +- .../of13/4-30-ofp_port_stats_reply.packet.json | 3 +- .../4-31-ofp_group_features_request.packet.json | 3 +- .../of13/4-32-ofp_group_features_reply.packet.json | 3 +- .../of13/4-33-ofp_group_desc_request.packet.json | 3 +- .../of13/4-34-ofp_group_desc_reply.packet.json | 9 +- .../4-36-ofp_queue_get_config_reply.packet.json | 10 + .../of13/4-37-ofp_queue_stats_request.packet.json | 3 +- .../of13/4-38-ofp_queue_stats_reply.packet.json | 3 +- .../json/of13/4-4-ofp_packet_in.packet.json | 4 +- .../json/of13/4-40-ofp_flow_removed.packet.json | 4 +- .../json/of13/4-45-ofp_meter_mod.packet.json | 12 +- .../json/of13/4-46-ofp_flow_mod.packet.json | 9 +- .../of13/4-47-ofp_meter_config_request.packet.json | 3 +- .../of13/4-48-ofp_meter_config_reply.packet.json | 8 +- .../of13/4-49-ofp_meter_stats_request.packet.json | 3 +- .../of13/4-50-ofp_meter_stats_reply.packet.json | 4 +- .../4-51-ofp_meter_features_request.packet.json | 3 +- .../of13/4-52-ofp_meter_features_reply.packet.json | 3 +- .../of13/4-53-ofp_port_desc_request.packet.json | 3 +- .../json/of13/4-54-ofp_port_desc_reply.packet.json | 3 +- .../of13/4-56-ofp_table_features_reply.packet.json | 13 +- ryu/tests/unit/ofproto/test_parser.py | 20 ++ ryu/tests/unit/ofproto/test_parser_v12.py | 28 +-- 57 files changed, 490 insertions(+), 299 deletions(-) -- 1.8.3.1 ------------------------------------------------------------------------------ Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more! Discover the easy way to master current and previous Microsoft technologies and advance your career. Get an incredible 1,500+ hours of step-by-step tutorial videos with LearnDevNow. Subscribe today and save! http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
