This set implements conjunction and its tests.

IWAMOTO Toshihiro (4):
  Implement NXActionConjunction and conj_id match for OF1.3 and OF1.5
  packet_data_generator2: Generate conjunction packets
  packet_data: Regen
  test_parser: Add some expected json representations

 ryu/ofproto/nicira_ext.py                          |    1 +
 ryu/ofproto/nx_actions.py                          |   40 ++++++++
 ryu/ofproto/ofproto_v1_3.py                        |    1 +
 ryu/ofproto/ofproto_v1_5.py                        |    1 +
 .../libofproto-OFP13-flow_mod_conjunction.packet   |  Bin 0 -> 144 bytes
 .../libofproto-OFP13-flow_mod_match_conj.packet    |  Bin 0 -> 104 bytes
 .../libofproto-OFP15-flow_mod_conjunction.packet   |  Bin 0 -> 144 bytes
 .../libofproto-OFP15-flow_mod_match_conj.packet    |  Bin 0 -> 104 bytes
 ryu/tests/packet_data_generator2/gen.c             |   60 ++++++++++++
 ...bofproto-OFP13-flow_mod_conjunction.packet.json |  100 +++++++++++++++++++
 ...ibofproto-OFP13-flow_mod_match_conj.packet.json |   64 +++++++++++++
 ...bofproto-OFP15-flow_mod_conjunction.packet.json |  101 ++++++++++++++++++++
 ...ibofproto-OFP15-flow_mod_match_conj.packet.json |   65 +++++++++++++
 13 files changed, 433 insertions(+)
 create mode 100644 
ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod_conjunction.packet
 create mode 100644 
ryu/tests/packet_data/of13/libofproto-OFP13-flow_mod_match_conj.packet
 create mode 100644 
ryu/tests/packet_data/of15/libofproto-OFP15-flow_mod_conjunction.packet
 create mode 100644 
ryu/tests/packet_data/of15/libofproto-OFP15-flow_mod_match_conj.packet
 create mode 100644 
ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_conjunction.packet.json
 create mode 100644 
ryu/tests/unit/ofproto/json/of13/libofproto-OFP13-flow_mod_match_conj.packet.json
 create mode 100644 
ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_conjunction.packet.json
 create mode 100644 
ryu/tests/unit/ofproto/json/of15/libofproto-OFP15-flow_mod_match_conj.packet.json

-- 
1.7.10.4


------------------------------------------------------------------------------
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel

Reply via email to