vom: Fix the l2 port type in bridge domain

[vpp.git] / src / vat / api_format.c

diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index d334bcc..99ede1e 100644 (file)
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -1355,7 +1355,7 @@ static void
 vl_api_l2_macs_event_t_handler (vl_api_l2_macs_event_t * mp)
 {
   u32 n_macs = ntohl (mp->n_macs);
-  errmsg ("L2MAC event recived with pid %d cl-idx %d for %d macs: \n",
+  errmsg ("L2MAC event received with pid %d cl-idx %d for %d macs: \n",
          ntohl (mp->pid), mp->client_index, n_macs);
   int i;
   for (i = 0; i < n_macs; i++)
@@ -1389,12 +1389,13 @@ static void vl_api_bridge_domain_details_t_handler
   u32 n_sw_ifs = ntohl (mp->n_sw_ifs);
   int i;
 
-  print (vam->ofp, "\n%-3s %-3s %-3s %-3s %-3s %-3s",
-        " ID", "LRN", "FWD", "FLD", "BVI", "#IF");
+  print (vam->ofp, "\n%-3s %-3s %-3s %-3s %-3s %-6s %-3s",
+        " ID", "LRN", "FWD", "FLD", "BVI", "UU-FWD", "#IF");
 
-  print (vam->ofp, "%3d %3d %3d %3d %3d %3d",
+  print (vam->ofp, "%3d %3d %3d %3d %3d %6d %3d",
         ntohl (mp->bd_id), mp->learn, mp->forward,
-        mp->flood, ntohl (mp->bvi_sw_if_index), n_sw_ifs);
+        mp->flood, ntohl (mp->bvi_sw_if_index),
+        ntohl (mp->uu_fwd_sw_if_index), n_sw_ifs);
 
   if (n_sw_ifs)
     {
@@ -9298,7 +9299,7 @@ api_mpls_ip_bind_unbind (vat_main_t * vam)
 
   if (!address_set)
     {
-      errmsg ("IP addres not set");
+      errmsg ("IP address not set");
       return -99;
     }
 
@@ -20424,23 +20425,20 @@ api_mpls_tunnel_dump (vat_main_t * vam)
 {
   vl_api_mpls_tunnel_dump_t *mp;
   vl_api_control_ping_t *mp_ping;
-  i32 index = -1;
+  u32 sw_if_index = ~0;
   int ret;
 
   /* Parse args required to build the message */
   while (unformat_check_input (vam->input) != UNFORMAT_END_OF_INPUT)
     {
-      if (!unformat (vam->input, "tunnel_index %d", &index))
-       {
-         index = -1;
-         break;
-       }
+      if (unformat (vam->input, "sw_if_index %d", &sw_if_index))
+       ;
     }
 
-  print (vam->ofp, "  tunnel_index %d", index);
+  print (vam->ofp, "  sw_if_index %d", sw_if_index);
 
   M (MPLS_TUNNEL_DUMP, mp);
-  mp->tunnel_index = htonl (index);
+  mp->sw_if_index = htonl (sw_if_index);
   S (mp);
 
   /* Use a control ping for synchronization */
@@ -23852,7 +23850,7 @@ _(one_ndp_entries_get, "bd <bridge-domain>")                            \
 _(one_add_del_l2_arp_entry, "[del] mac <mac> bd <bd> ip4 <ip4>")        \
 _(one_l2_arp_bd_get, "")                                                \
 _(one_l2_arp_entries_get, "bd <bridge-domain>")                         \
-_(one_stats_enable_disable, "enable|disalbe")                           \
+_(one_stats_enable_disable, "enable|disable")                           \
 _(show_one_stats_enable_disable, "")                                    \
 _(one_eid_table_vni_dump, "")                                           \
 _(one_eid_table_map_dump, "l2|l3")                                      \