From dbbd05f7bb7c967387da1d24704d1ed8fc1f7f26 Mon Sep 17 00:00:00 2001 From: IWASE Yusuke Date: Tue, 19 Jan 2016 13:46:12 +0900 Subject: [PATCH] test_ofctl: Update json representations Signed-off-by: IWASE Yusuke Signed-off-by: FUJITA Tomonori --- .../lib/ofctl_json/of12/3-12-ofp_flow_stats_reply.packet.json | 4 ++-- .../ofctl_json/of12/3-28-ofp_table_stats_reply.packet.json | 2 +- .../of12/3-36-ofp_queue_get_config_reply.packet.json | 2 +- .../lib/ofctl_json/of13/4-12-ofp_flow_stats_reply.packet.json | 4 ++-- .../of13/4-36-ofp_queue_get_config_reply.packet.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ryu/tests/unit/lib/ofctl_json/of12/3-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-12-ofp_flow_stats_reply.packet.json index 671001a7..4d73e0b5 100644 --- a/ryu/tests/unit/lib/ofctl_json/of12/3-12-ofp_flow_stats_reply.packet.json +++ b/ryu/tests/unit/lib/ofctl_json/of12/3-12-ofp_flow_stats_reply.packet.json @@ -22,7 +22,7 @@ "hard_timeout": 0, "idle_timeout": 0, "actions": [ - "OUTPUT:4294967290" + "OUTPUT:NORMAL" ], "length": 88, "match": { @@ -61,7 +61,7 @@ "actions": [ { "WRITE_ACTIONS": [ - "OUTPUT:4294967293" + "OUTPUT:CONTROLLER" ] } ], diff --git a/ryu/tests/unit/lib/ofctl_json/of12/3-28-ofp_table_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-28-ofp_table_stats_reply.packet.json index 55fcb526..7444a29a 100644 --- a/ryu/tests/unit/lib/ofctl_json/of12/3-28-ofp_table_stats_reply.packet.json +++ b/ryu/tests/unit/lib/ofctl_json/of12/3-28-ofp_table_stats_reply.packet.json @@ -32081,7 +32081,7 @@ "max_entries": 16777216, "lookup_count": 0, "metadata_match": 18446744073709551615, - "table_id": 254, + "table_id": "MAX", "instructions": [ "GOTO_TABLE", "WRITE_METADATA", diff --git a/ryu/tests/unit/lib/ofctl_json/of12/3-36-ofp_queue_get_config_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of12/3-36-ofp_queue_get_config_reply.packet.json index e09c538f..8e922a9a 100644 --- a/ryu/tests/unit/lib/ofctl_json/of12/3-36-ofp_queue_get_config_reply.packet.json +++ b/ryu/tests/unit/lib/ofctl_json/of12/3-36-ofp_queue_get_config_reply.packet.json @@ -1,7 +1,7 @@ { "1": [ { - "port": 4294967295, + "port": "ANY", "queues": [ { "len": 48, diff --git a/ryu/tests/unit/lib/ofctl_json/of13/4-12-ofp_flow_stats_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-12-ofp_flow_stats_reply.packet.json index ce84e831..763586f9 100644 --- a/ryu/tests/unit/lib/ofctl_json/of13/4-12-ofp_flow_stats_reply.packet.json +++ b/ryu/tests/unit/lib/ofctl_json/of13/4-12-ofp_flow_stats_reply.packet.json @@ -17,7 +17,7 @@ }, { "actions": [ - "OUTPUT:4294967290" + "OUTPUT:NORMAL" ], "byte_count": 0, "cookie": 0, @@ -81,7 +81,7 @@ "SET_FIELD: {pbb_uca:1}", { "WRITE_ACTIONS": [ - "OUTPUT:4294967293" + "OUTPUT:CONTROLLER" ] } ], diff --git a/ryu/tests/unit/lib/ofctl_json/of13/4-36-ofp_queue_get_config_reply.packet.json b/ryu/tests/unit/lib/ofctl_json/of13/4-36-ofp_queue_get_config_reply.packet.json index 8564c3a7..9d529400 100644 --- a/ryu/tests/unit/lib/ofctl_json/of13/4-36-ofp_queue_get_config_reply.packet.json +++ b/ryu/tests/unit/lib/ofctl_json/of13/4-36-ofp_queue_get_config_reply.packet.json @@ -1,7 +1,7 @@ { "1": [ { - "port": 4294967295, + "port": "ANY", "queues": [ { "len": 64,