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

[openvswitch] / lib / ofp-print.c

diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index 828740acbc28be7791b4e3069350308f1d1697eb..7b5e456fd8f58c1a7a689713672237d0fa140ed6 100644 (file)
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -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, ' ');
@@ -1059,19 +1059,20 @@ ofp_print_ofpst_desc_reply(struct ds *string, const struct ofp_desc_stats *ods)
 }
 
 static void
-ofp_print_flow_stats_request(struct ds *string, const struct ofp_header *oh)
+ofp_print_flow_stats_request(struct ds *string,
+                             const struct ofp_stats_msg *osm)
 {
     struct flow_stats_request fsr;
     int error;
 
-    error = ofputil_decode_flow_stats_request(&fsr, oh);
+    error = ofputil_decode_flow_stats_request(&fsr, &osm->header);
     if (error) {
         ofp_print_error(string, error);
         return;
     }
 
     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) {
@@ -1110,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) {
@@ -1447,7 +1448,7 @@ ofp_to_string__(const struct ofp_header *oh,
     case OFPUTIL_OFPST_AGGREGATE_REQUEST:
     case OFPUTIL_NXST_AGGREGATE_REQUEST:
         ofp_print_stats_request(string, oh);
-        ofp_print_flow_stats_request(string, oh);
+        ofp_print_flow_stats_request(string, msg);
         break;
 
     case OFPUTIL_OFPST_TABLE_REQUEST: