Merge pull request #10633 from ton31337/fix/deprecate_sr_local-block

isisd: Drop deprecated `segment-routing local-block` command
This commit is contained in:
Igor Ryzhov 2022-02-23 14:37:45 +03:00 committed by GitHub
commit 3557785c2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 51 deletions

View File

@ -396,13 +396,6 @@ Known limitations:
may not exceed 65535. Optionally sets also the Segment Routing Local Block.
The negative command always unsets both.
.. clicmd:: segment-routing local-block (16-1048575) (16-1048575)
Set the Segment Routing Local Block i.e. the label range used by MPLS
to store label in the MPLS FIB for Adjacency SID. Note that the block size
may not exceed 65535. This command is deprecated in favor of the combined
'segment-routing global-block A B local-block C D' command.
.. clicmd:: segment-routing node-msd (1-16)
Set the Maximum Stack Depth supported by the router. The value depend of the

View File

@ -1559,48 +1559,6 @@ void cli_show_isis_label_blocks(struct vty *vty, const struct lyd_node *dnode,
vty_out(vty, "\n");
}
/*
* XPath: /frr-isisd:isis/instance/segment-routing/srlb
*/
DEFPY_HIDDEN(
isis_sr_local_block_label_range, isis_sr_local_block_label_range_cmd,
"segment-routing local-block (16-1048575)$lower_bound (16-1048575)$upper_bound",
SR_STR
"Segment Routing Local Block label range\n"
"The lower bound of the block\n"
"The upper bound of the block (block size may not exceed 65535)\n")
{
#if CONFDATE > 20220217
CPP_NOTICE("Use of the local-block command is deprecated")
#endif
nb_cli_enqueue_change(vty,
"./segment-routing/label-blocks/srlb/lower-bound",
NB_OP_MODIFY, lower_bound_str);
nb_cli_enqueue_change(vty,
"./segment-routing/label-blocks/srlb/upper-bound",
NB_OP_MODIFY, upper_bound_str);
return nb_cli_apply_changes(vty, NULL);
}
DEFPY_HIDDEN(no_isis_sr_local_block_label_range,
no_isis_sr_local_block_label_range_cmd,
"no segment-routing local-block [(16-1048575) (16-1048575)]",
NO_STR SR_STR
"Segment Routing Local Block label range\n"
"The lower bound of the block\n"
"The upper bound of the block (block size may not exceed 65535)\n")
{
nb_cli_enqueue_change(vty,
"./segment-routing/label-blocks/srlb/lower-bound",
NB_OP_MODIFY, NULL);
nb_cli_enqueue_change(vty,
"./segment-routing/label-blocks/srlb/upper-bound",
NB_OP_MODIFY, NULL);
return nb_cli_apply_changes(vty, NULL);
}
/*
* XPath: /frr-isisd:isis/instance/segment-routing/msd/node-msd
*/
@ -3189,8 +3147,6 @@ void isis_cli_init(void)
install_element(ISIS_NODE, &no_isis_sr_enable_cmd);
install_element(ISIS_NODE, &isis_sr_global_block_label_range_cmd);
install_element(ISIS_NODE, &no_isis_sr_global_block_label_range_cmd);
install_element(ISIS_NODE, &isis_sr_local_block_label_range_cmd);
install_element(ISIS_NODE, &no_isis_sr_local_block_label_range_cmd);
install_element(ISIS_NODE, &isis_sr_node_msd_cmd);
install_element(ISIS_NODE, &no_isis_sr_node_msd_cmd);
install_element(ISIS_NODE, &isis_sr_prefix_sid_cmd);