From 90da24356f2d00801fa492b9fa40d8e10ebdb7bf Mon Sep 17 00:00:00 2001 From: John Lo Date: Wed, 8 Jun 2016 16:08:48 -0400 Subject: VPP-115: Remove stale ACL CLIs which are not supported The old ACL CLIs still show up in CLI help which can confuse users. Change-Id: I9a3722d3d649c4370df6a09b2c07628e7e4aa0f4 Signed-off-by: John Lo --- vnet/vnet/l2/l2_input_acl.c | 39 --------------------------------------- vnet/vnet/l2/l2_output_acl.c | 3 +++ 2 files changed, 3 insertions(+), 39 deletions(-) diff --git a/vnet/vnet/l2/l2_input_acl.c b/vnet/vnet/l2/l2_input_acl.c index 49df0f65ce4..68823e77594 100644 --- a/vnet/vnet/l2/l2_input_acl.c +++ b/vnet/vnet/l2/l2_input_acl.c @@ -389,42 +389,3 @@ clib_error_t *l2_inacl_init (vlib_main_t *vm) } VLIB_INIT_FUNCTION (l2_inacl_init); - - -// set subinterface inacl enable/disable -// The CLI format is: -// set interface acl input [disable] -static clib_error_t * -int_l2_inacl (vlib_main_t * vm, - unformat_input_t * input, - vlib_cli_command_t * cmd) -{ - vnet_main_t * vnm = vnet_get_main(); - clib_error_t * error = 0; - u32 sw_if_index; - u32 enable; - - if (! unformat_user (input, unformat_vnet_sw_interface, vnm, &sw_if_index)) - { - error = clib_error_return (0, "unknown interface `%U'", - format_unformat_error, input); - goto done; - } - - enable = 1; - if (unformat (input, "disable")) { - enable = 0; - } - - // set the interface flag - l2input_intf_bitmap_enable(sw_if_index, L2INPUT_FEAT_ACL, enable); - - done: - return error; -} - -VLIB_CLI_COMMAND (int_l2_inacl_cli, static) = { - .path = "set interface acl input", - .short_help = "set interface acl input [disable]", - .function = int_l2_inacl, -}; diff --git a/vnet/vnet/l2/l2_output_acl.c b/vnet/vnet/l2/l2_output_acl.c index f75345f1dbd..dc133232eab 100644 --- a/vnet/vnet/l2/l2_output_acl.c +++ b/vnet/vnet/l2/l2_output_acl.c @@ -296,6 +296,8 @@ clib_error_t *l2_outacl_init (vlib_main_t *vm) VLIB_INIT_FUNCTION (l2_outacl_init); +#if 0 +/** @todo maybe someone will add output ACL's in the future */ // set subinterface outacl enable/disable // The CLI format is: // set interface acl output [disable] @@ -333,3 +335,4 @@ VLIB_CLI_COMMAND (int_l2_outacl_cli, static) = { .short_help = "set interface acl output [disable]", .function = int_l2_outacl, }; +#endif -- cgit 1.2.3-korg