commit 8f6e3218623ddbb836d6a47ed2678f8ab99f2471
author Neale Ranns <nranns@cisco.com> Mon Jun 04 17:10:18 2018 -0700
committer Florin Coras <florin.coras@gmail.com> Tue Jun 05 06:34:34 2018 +0000
tree 19aab4a36b9eed950ed7b72faf7e67e9703329ed
parent 473f46135c3fd77dad5614215cc279b1164e9a74

BIER CLI show commands; no crash on non-existant objects (VPP-1303)

DBGvpp# sh bier disp entry
DBGvpp# sh bier disp entry 0
No such BIER disp entry: 0
DBGvpp# sh bier disp table
DBGvpp# sh bier disp table 0
No such BIER disp table: 0
DBGvpp# sh bier disp table 11
No such BIER disp table: 11
DBGvpp#

DBGvpp# sh bier bift
no BIFT entries
DBGvpp# sh bier bift set 0
no BIFT entries
DBGvpp# sh bier bift set 0 sd 0 bsl 0
no BIFT entries
DBGvpp#

DBGvpp# sh bier fib
No BIER tables
DBGvpp# sh bier fib 0
DBGvpp# sh bier fib 0 4

DBGvpp# sh bier fmask
DBGvpp# sh bier fmask 2
No BIER f-mask 2

DBGvpp# sh bier imp
DBGvpp# sh bier imp 0
No such BIER imposition: 0

Change-Id: Ibadac3441dd8a6d1b96bd9ee4358e28498875b95
Signed-off-by: Neale Ranns <nranns@cisco.com>

src/vnet/bier/bier_disp_entry.c

diff --git a/src/vnet/bier/bier_disp_entry.c b/src/vnet/bier/bier_disp_entry.c
index 2fe2e4a..2df8314 100644
--- a/src/vnet/bier/bier_disp_entry.c
+++ b/src/vnet/bier/bier_disp_entry.c
@@ -375,8 +375,15 @@
     }
     else
     {
-        vlib_cli_output(vm, "%U", format_bier_disp_entry, bdei, 1,
-                        BIER_SHOW_DETAIL);
+        if (pool_is_free_index(bier_disp_entry_pool, bdei))
+        {
+            vlib_cli_output(vm, "No such BIER disp entry: %d", bdei);
+        }
+        else
+        {
+            vlib_cli_output(vm, "%U", format_bier_disp_entry, bdei, 1,
+                            BIER_SHOW_DETAIL);
+        }
     }
     return (NULL);
 }

src/vnet/bier/bier_disp_table.c

diff --git a/src/vnet/bier/bier_disp_table.c b/src/vnet/bier/bier_disp_table.c
index c663286..68edb08 100644
--- a/src/vnet/bier/bier_disp_table.c
+++ b/src/vnet/bier/bier_disp_table.c
@@ -385,8 +385,15 @@
     }
     else
     {
-        vlib_cli_output(vm, "%U", format_bier_disp_table, bdti, 0,
-                        BIER_SHOW_DETAIL);
+        if (pool_is_free_index(bier_disp_table_pool, bdti))
+        {
+            vlib_cli_output(vm, "No such BIER disp table: %d", bdti);
+        }
+        else
+        {
+            vlib_cli_output(vm, "%U", format_bier_disp_table, bdti, 0,
+                            BIER_SHOW_DETAIL);
+        }
     }
     return (NULL);
 }

src/vnet/bier/bier_imp.c

diff --git a/src/vnet/bier/bier_imp.c b/src/vnet/bier/bier_imp.c
index bd934b7..0c87d17 100644
--- a/src/vnet/bier/bier_imp.c
+++ b/src/vnet/bier/bier_imp.c
@@ -275,8 +275,15 @@
     }
     else
     {
-        vlib_cli_output(vm, "%U", format_bier_imp, bii, 1,
-                        BIER_SHOW_DETAIL);
+        if (pool_is_free_index(bier_imp_pool, bii))
+        {
+            vlib_cli_output(vm, "No such BIER imposition: %d", bii);
+        }
+        else
+        {
+            vlib_cli_output(vm, "%U", format_bier_imp, bii, 1,
+                            BIER_SHOW_DETAIL);
+        }
     }
     return (NULL);
 }