diff options
| author | YAMAMOTO Takashi <yamamoto@valinux.co.jp> | 2013-11-20 15:48:33 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2013-11-20 05:45:39 -0800 |
| commit | 23f5ff3bd142c974156824c03a46b836562fdf96 (patch) | |
| tree | 963c197890432396c0f239eda878cb32164eb7bb | |
| parent | fbada6cc0cbff5d93f4ff925c01596c1707d6347 (diff) | |
test_parser: update expected json representations for EXT-256
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
4 files changed, 184 insertions, 4 deletions
diff --git a/ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json index 9d6f5637..4b3483f5 100644 --- a/ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of13/4-12-ofp_flow_stats_reply.packet.json @@ -132,6 +132,161 @@ "OFPInstructionActions": { "actions": [ { + "OFPActionSetField": { + "field": { + "OXMTlv": { + "field": "vlan_vid", + "mask": null, + "value": 258 + } + } + } + }, + { + "OFPActionCopyTtlOut": { + "len": 8, + "type": 11 + } + }, + { + "OFPActionCopyTtlIn": { + "len": 8, + "type": 12 + } + }, + { + "OFPActionCopyTtlIn": { + "len": 8, + "type": 12 + } + }, + { + "OFPActionPopPbb": { + "len": 8, + "type": 27 + } + }, + { + "OFPActionPushPbb": { + "ethertype": 4660, + "len": 8, + "type": 26 + } + }, + { + "OFPActionPopMpls": { + "ethertype": 39030, + "len": 8, + "type": 20 + } + }, + { + "OFPActionPushMpls": { + "ethertype": 34887, + "len": 8, + "type": 19 + } + }, + { + "OFPActionPopVlan": { + "len": 8, + "type": 18 + } + }, + { + "OFPActionPushVlan": { + "ethertype": 33024, + "len": 8, + "type": 17 + } + }, + { + "OFPActionDecMplsTtl": { + "len": 8, + "type": 16 + } + }, + { + "OFPActionSetMplsTtl": { + "len": 8, + "mpls_ttl": 10, + "type": 15 + } + }, + { + "OFPActionDecNwTtl": { + "len": 8, + "type": 24 + } + }, + { + "OFPActionSetNwTtl": { + "len": 8, + "nw_ttl": 10, + "type": 23 + } + }, + { + "OFPActionSetQueue": { + "len": 8, + "queue_id": 3, + "type": 21 + } + }, + { + "OFPActionGroup": { + "group_id": 99, + "len": 8, + "type": 22 + } + }, + { + "OFPActionOutput": { + "len": 16, + "max_len": 65535, + "port": 6, + "type": 0 + } + } + ], + "len": 160, + "type": 3 + } + }, + { + "OFPInstructionActions": { + "actions": [ + { + "OFPActionSetField": { + "field": { + "OXMTlv": { + "field": "eth_src", + "mask": null, + "value": "01:02:03:04:05:06" + } + } + } + }, + { + "OFPActionSetField": { + "field": { + "OXMTlv": { + "field": "pbb_uca", + "mask": null, + "value": 1 + } + } + } + } + ], + "len": 40, + "type": 4 + } + }, + { + "OFPInstructionActions": { + "actions": [ + { "OFPActionOutput": { "len": 16, "max_len": 65535, @@ -145,7 +300,7 @@ } } ], - "length": 80, + "length": 280, "match": { "OFPMatch": { "length": 4, diff --git a/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json index 6f8b371d..d644545e 100644 --- a/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json +++ b/ryu/tests/unit/ofproto/json/of13/4-2-ofp_flow_mod.packet.json @@ -146,9 +146,20 @@ } } } + }, + { + "OFPActionSetField": { + "field": { + "OXMTlv": { + "field": "pbb_uca", + "mask": null, + "value": 1 + } + } + } } ], - "len": 24, + "len": 40, "type": 4 } } diff --git a/ryu/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json b/ryu/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json index eb60861b..1e84f7b5 100644 --- a/ryu/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json +++ b/ryu/tests/unit/ofproto/json/of13/4-59-ofp_packet_in.packet.json @@ -5,7 +5,7 @@ "data": "", "match": { "OFPMatch": { - "length": 324, + "length": 335, "oxm_fields": [ { "OXMTlv": { @@ -279,6 +279,13 @@ "mask": null, "value": 500 } + }, + { + "OXMTlv": { + "field": "pbb_uca", + "mask": null, + "value": 1 + } } ], "type": 1 diff --git a/ryu/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json index 01034bda..2ac6568e 100644 --- a/ryu/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json +++ b/ryu/tests/unit/ofproto/json/of13/4-60-ofp_flow_mod.packet.json @@ -10,7 +10,7 @@ "instructions": [], "match": { "OFPMatch": { - "length": 324, + "length": 335, "oxm_fields": [ { "OXMTlv": { @@ -284,6 +284,13 @@ "mask": null, "value": 500 } + }, + { + "OXMTlv": { + "field": "pbb_uca", + "mask": null, + "value": 1 + } } ], "type": 1 |