2
0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00

ofp-print: Change "table_id" to "table" in flow_mod and flow_stats.

Flow dumps printed the OpenFlow table ID under the name "table_id", but
the flow parser only accepted "table".  This makes them consistent by
changing the output.  (Another alternative would be to change the accepted
input name.)
This commit is contained in:
Ben Pfaff
2011-06-08 12:36:53 -07:00
parent 33d8c6b412
commit e896c2d42d
4 changed files with 30 additions and 30 deletions

View File

@@ -857,7 +857,7 @@ ofp_print_flow_mod(struct ds *s, const struct ofp_header *oh,
ds_put_format(s, "cmd:%d", fm.command);
}
if (fm.table_id != 0) {
ds_put_format(s, " table_id:%d", fm.table_id);
ds_put_format(s, " table:%d", fm.table_id);
}
ds_put_char(s, ' ');
@@ -1072,7 +1072,7 @@ ofp_print_flow_stats_request(struct ds *string,
}
if (fsr.table_id != 0xff) {
ds_put_format(string, " table_id=%"PRIu8, fsr.table_id);
ds_put_format(string, " table=%"PRIu8, fsr.table_id);
}
if (fsr.out_port != OFPP_NONE) {
@@ -1111,7 +1111,7 @@ ofp_print_flow_stats_reply(struct ds *string, const struct ofp_header *oh)
ds_put_format(string, " cookie=0x%"PRIx64", duration=",
ntohll(fs.cookie));
ofp_print_duration(string, fs.duration_sec, fs.duration_nsec);
ds_put_format(string, ", table_id=%"PRIu8", ", fs.table_id);
ds_put_format(string, ", table=%"PRIu8", ", fs.table_id);
ds_put_format(string, "n_packets=%"PRIu64", ", fs.packet_count);
ds_put_format(string, "n_bytes=%"PRIu64", ", fs.byte_count);
if (fs.idle_timeout != OFP_FLOW_PERMANENT) {