summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Lo <loj@cisco.com>2016-06-08 16:08:48 -0400
committerChris Luke <chris_luke@cable.comcast.com>2016-06-09 00:44:11 +0000
commitbbb7682790d774f5bcd9800f0898cfac5c4719c9 (patch)
tree9945294c49a6b5b7e9a0e29740d8ff82e310650b
parentec6290a8a50ab7e551b858d4f1b7b565bf2b0c1e (diff)
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 <loj@cisco.com>
-rw-r--r--vnet/vnet/l2/l2_input_acl.c39
-rw-r--r--vnet/vnet/l2/l2_output_acl.c3
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 68c005f11de..d3038e8df1e 100644
--- a/vnet/vnet/l2/l2_input_acl.c
+++ b/vnet/vnet/l2/l2_input_acl.c
@@ -391,42 +391,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 <interface> [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 <interface> [disable]",
- .function = int_l2_inacl,
-};
diff --git a/vnet/vnet/l2/l2_output_acl.c b/vnet/vnet/l2/l2_output_acl.c
index b222255f47e..cf6be97412a 100644
--- a/vnet/vnet/l2/l2_output_acl.c
+++ b/vnet/vnet/l2/l2_output_acl.c
@@ -298,6 +298,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 <interface> [disable]
@@ -335,3 +337,4 @@ VLIB_CLI_COMMAND (int_l2_outacl_cli, static) = {
.short_help = "set interface acl output <interface> [disable]",
.function = int_l2_outacl,
};
+#endif