diff options
| author | YAMAMOTO Takashi <yamamoto@valinux.co.jp> | 2013-09-02 15:05:51 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2013-09-02 19:41:36 +0900 |
| commit | 3d623c82c77b88ae5d796e388d75aebdc25c6975 (patch) | |
| tree | ecacbcfbe5b066f3a4f4a315545a6d81794c8426 | |
| parent | 80533a0afb5a152b36ef5cfa8ccf54376ce9b855 (diff) | |
of12: update *.json after "len" "type" changes
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
7 files changed, 35 insertions, 8 deletions
diff --git a/ryu/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json b/ryu/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json index 64fb7903..e6bf2456 100644 --- a/ryu/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json +++ b/ryu/tests/unit/ofproto/json/of12/3-1-ofp_packet_out.packet.json @@ -3,8 +3,10 @@ "actions": [ { "OFPActionOutput": { + "len": 16, "max_len": 65535, - "port": 4294967292 + "port": 4294967292, + "type": 0 } } ], diff --git a/ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json index 72e5be7c..f2e382b8 100644 --- a/ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of12/3-12-ofp_flow_stats_reply.packet.json @@ -34,11 +34,14 @@ "actions": [ { "OFPActionOutput": { + "len": 16, "max_len": 0, - "port": 4294967290 + "port": 4294967290, + "type": 0 } } ], + "len": 24, "type": 4 } } @@ -72,7 +75,9 @@ "instructions": [ { "OFPInstructionGotoTable": { - "table_id": 1 + "len": 8, + "table_id": 1, + "type": 1 } } ], @@ -115,11 +120,14 @@ "actions": [ { "OFPActionOutput": { + "len": 16, "max_len": 65535, - "port": 4294967293 + "port": 4294967293, + "type": 0 } } ], + "len": 24, "type": 3 } } diff --git a/ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json index 558affca..7fb726e5 100644 --- a/ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json +++ b/ryu/tests/unit/ofproto/json/of12/3-2-ofp_flow_mod.packet.json @@ -24,11 +24,14 @@ }, { "OFPActionOutput": { + "len": 16, "max_len": 65535, - "port": 6 + "port": 6, + "type": 0 } } ], + "len": 40, "type": 3 } } diff --git a/ryu/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json index 6b66df4d..1a3767da 100644 --- a/ryu/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json +++ b/ryu/tests/unit/ofproto/json/of12/3-21-ofp_group_mod.packet.json @@ -6,11 +6,14 @@ "actions": [ { "OFPActionOutput": { + "len": 16, "max_len": 65535, - "port": 2 + "port": 2, + "type": 0 } } ], + "len": 32, "watch_group": 1, "watch_port": 1, "weight": 1 diff --git a/ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json b/ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json index 55ff1651..012f650b 100644 --- a/ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json +++ b/ryu/tests/unit/ofproto/json/of12/3-3-ofp_flow_mod.packet.json @@ -10,7 +10,9 @@ "instructions": [ { "OFPInstructionGotoTable": { - "table_id": 1 + "len": 8, + "table_id": 1, + "type": 1 } } ], diff --git a/ryu/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json index d662e5d4..9946b58f 100644 --- a/ryu/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of12/3-34-ofp_group_desc_stats_reply.packet.json @@ -9,11 +9,14 @@ "actions": [ { "OFPActionOutput": { + "len": 16, "max_len": 65535, - "port": 2 + "port": 2, + "type": 0 } } ], + "len": 32, "watch_group": 1, "watch_port": 1, "weight": 1 diff --git a/ryu/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json b/ryu/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json index 818ca766..1322af7e 100644 --- a/ryu/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json +++ b/ryu/tests/unit/ofproto/json/of12/3-36-ofp_queue_get_config_reply.packet.json @@ -4,15 +4,18 @@ "queues": [ { "OFPPacketQueue": { + "len": 48, "port": 77, "properties": [ { "OFPQueuePropMinRate": { + "len": 16, "rate": 10 } }, { "OFPQueuePropMaxRate": { + "len": 16, "rate": 900 } } @@ -22,15 +25,18 @@ }, { "OFPPacketQueue": { + "len": 48, "port": 77, "properties": [ { "OFPQueuePropMinRate": { + "len": 16, "rate": 100 } }, { "OFPQueuePropMaxRate": { + "len": 16, "rate": 200 } } |