diff options
| author | Simon Horman <horms@verge.net.au> | 2014-02-26 16:26:08 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2014-02-27 13:59:39 +0900 |
| commit | a0fef2d6df6edcea1c93a3873e6a0093d1f250f9 (patch) | |
| tree | bcf8075da226e64cbf1a40fe30e2b9504efdb7bc | |
| parent | 68e07855b586b0bf48a6ec3d0f4f89c76bff1713 (diff) | |
of14: Add experimenter property to table features reply 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-54-ofp_table_features_reply.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-54-ofp_table_features_reply.packet.json | 33 |
3 files changed, 43 insertions, 4 deletions
diff --git a/ryu/tests/packet_data/of14/5-54-ofp_table_features_reply.packet b/ryu/tests/packet_data/of14/5-54-ofp_table_features_reply.packet Binary files differindex 578c0486..6b622a36 100644 --- a/ryu/tests/packet_data/of14/5-54-ofp_table_features_reply.packet +++ b/ryu/tests/packet_data/of14/5-54-ofp_table_features_reply.packet diff --git a/ryu/tests/packet_data_generator/src/x5.erl b/ryu/tests/packet_data_generator/src/x5.erl index ef2d52d7..e3b4849f 100644 --- a/ryu/tests/packet_data_generator/src/x5.erl +++ b/ryu/tests/packet_data_generator/src/x5.erl @@ -1768,7 +1768,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-54-ofp_table_features_reply.packet.json b/ryu/tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json index 3febfcec..93365584 100644 --- a/ryu/tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of14/5-54-ofp_table_features_reply.packet.json @@ -4,7 +4,7 @@ { "OFPTableFeaturesStats": { "config": 0, - "length": 1112, + "length": 1168, "max_entries": 16777216, "metadata_match": 18446744073709551615, "metadata_write": 18446744073709551615, @@ -1590,8 +1590,35 @@ } ], "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 } |