diff options
author | Simon Horman <horms@verge.net.au> | 2014-02-26 16:26:09 +0900 |
---|---|---|
committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2014-02-27 13:59:39 +0900 |
commit | d86c96c49beea7b1311361a6b83b22fefef4930e (patch) | |
tree | 05e2f05adc0f60a0aa658ae2751b88e51930ad5c | |
parent | a0fef2d6df6edcea1c93a3873e6a0093d1f250f9 (diff) |
of14: Add experimenter property to table features request unit test
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r-- | ryu/tests/packet_data/of14/5-53-ofp_table_features_request.packet | bin | 11072 -> 11128 bytes | |||
-rw-r--r-- | ryu/tests/packet_data_generator/src/x5.erl | 14 | ||||
-rw-r--r-- | ryu/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json | 29 |
3 files changed, 41 insertions, 2 deletions
diff --git a/ryu/tests/packet_data/of14/5-53-ofp_table_features_request.packet b/ryu/tests/packet_data/of14/5-53-ofp_table_features_request.packet Binary files differindex 66887b07..7a7317aa 100644 --- a/ryu/tests/packet_data/of14/5-53-ofp_table_features_request.packet +++ b/ryu/tests/packet_data/of14/5-53-ofp_table_features_request.packet diff --git a/ryu/tests/packet_data_generator/src/x5.erl b/ryu/tests/packet_data_generator/src/x5.erl index e3b4849f..5d44aa3a 100644 --- a/ryu/tests/packet_data_generator/src/x5.erl +++ b/ryu/tests/packet_data_generator/src/x5.erl @@ -848,7 +848,19 @@ x() -> arp_tha,ipv6_src,ipv6_dst,ipv6_flabel, icmpv6_type,icmpv6_code,ipv6_nd_target, ipv6_nd_sll,ipv6_nd_tll,mpls_label,mpls_tc, - mpls_bos,pbb_isid]}]}, + mpls_bos,pbb_isid]}, + #ofp_table_feature_prop_experimenter{ + experimenter = 101, + exp_type = 0, + data = <<>>}, + #ofp_table_feature_prop_experimenter{ + experimenter = 101, + exp_type = 1, + data = <<1:32>>}, + #ofp_table_feature_prop_experimenter{ + experimenter = 101, + exp_type = 2, + data = <<1:32,2:32>>}]}, #ofp_table_features{ table_id = 1,name = <<"Flow Table 0x01">>, metadata_match = <<"\377\377\377\377\377\377\377\377">>, diff --git a/ryu/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json b/ryu/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json index 09f15cf7..e5a1b74e 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-53-ofp_table_features_request.packet.json @@ -4,7 +4,7 @@ { "OFPTableFeaturesStats": { "config": 0, - "length": 1112, + "length": 1168, "max_entries": 16777216, "metadata_match": 18446744073709551615, "metadata_write": 18446744073709551615, @@ -1591,6 +1591,33 @@ ], "type": 14 } + }, + { + "OFPTableFeaturePropExperimenter": { + "length": 12, + "type": 65534, + "exp_type": 0, + "experimenter": 101, + "data": [] + } + }, + { + "OFPTableFeaturePropExperimenter": { + "length": 16, + "type": 65534, + "exp_type": 1, + "experimenter": 101, + "data": [1] + } + }, + { + "OFPTableFeaturePropExperimenter": { + "length": 20, + "type": 65534, + "exp_type": 2, + "experimenter": 101, + "data": [1, 2] + } } ], "table_id": 0 |