zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / isisd / isis_te.c

diff --git a/isisd/isis_te.c b/isisd/isis_te.c
index 08b905c65032fd89ca22169329ac76cc45151d62..a69c95cadf8ce9073661cf07e5f00a68e39fa7bf 100644 (file)
--- a/isisd/isis_te.c
+++ b/isisd/isis_te.c
@@ -1087,141 +1087,6 @@ static struct mpls_te_circuit *lookup_mpls_params_by_ifp(struct interface *ifp)
        return circuit->mtc;
 }
 
-DEFUN (isis_mpls_te_on,
-       isis_mpls_te_on_cmd,
-       "mpls-te on",
-       MPLS_TE_STR
-       "Enable MPLS-TE functionality\n")
-{
-       struct listnode *node;
-       struct isis_circuit *circuit;
-
-       if (IS_MPLS_TE(isisMplsTE))
-               return CMD_SUCCESS;
-
-       if (IS_DEBUG_ISIS(DEBUG_TE))
-               zlog_debug("ISIS MPLS-TE: OFF -> ON");
-
-       isisMplsTE.status = enable;
-
-       /*
-        * Following code is intended to handle two cases;
-        *
-        * 1) MPLS-TE was disabled at startup time, but now become enabled.
-        * In this case, we must enable MPLS-TE Circuit regarding interface
-        * MPLS_TE flag
-        * 2) MPLS-TE was once enabled then disabled, and now enabled again.
-        */
-       for (ALL_LIST_ELEMENTS_RO(isisMplsTE.cir_list, node, circuit)) {
-               if (circuit->mtc == NULL || IS_FLOOD_AS(circuit->mtc->type))
-                       continue;
-
-               if ((circuit->mtc->status == disable)
-                   && HAS_LINK_PARAMS(circuit->interface))
-                       circuit->mtc->status = enable;
-               else
-                       continue;
-
-               /* Reoriginate STD_TE & GMPLS circuits */
-               if (circuit->area)
-                       lsp_regenerate_schedule(circuit->area, circuit->is_type,
-                                               0);
-       }
-
-       return CMD_SUCCESS;
-}
-
-DEFUN (no_isis_mpls_te_on,
-       no_isis_mpls_te_on_cmd,
-       "no mpls-te",
-       NO_STR
-       "Disable the MPLS-TE functionality\n")
-{
-       struct listnode *node;
-       struct isis_circuit *circuit;
-
-       if (isisMplsTE.status == disable)
-               return CMD_SUCCESS;
-
-       if (IS_DEBUG_ISIS(DEBUG_TE))
-               zlog_debug("ISIS MPLS-TE: ON -> OFF");
-
-       isisMplsTE.status = disable;
-
-       /* Flush LSP if circuit engage */
-       for (ALL_LIST_ELEMENTS_RO(isisMplsTE.cir_list, node, circuit)) {
-               if (circuit->mtc == NULL || (circuit->mtc->status == disable))
-                       continue;
-
-               /* disable MPLS_TE Circuit */
-               circuit->mtc->status = disable;
-
-               /* Re-originate circuit without STD_TE & GMPLS parameters */
-               if (circuit->area)
-                       lsp_regenerate_schedule(circuit->area, circuit->is_type,
-                                               0);
-       }
-
-       return CMD_SUCCESS;
-}
-
-DEFUN (isis_mpls_te_router_addr,
-       isis_mpls_te_router_addr_cmd,
-       "mpls-te router-address A.B.C.D",
-       MPLS_TE_STR
-       "Stable IP address of the advertising router\n"
-       "MPLS-TE router address in IPv4 address format\n")
-{
-       int idx_ipv4 = 2;
-       struct in_addr value;
-       struct listnode *node;
-       struct isis_area *area;
-
-       if (!inet_aton(argv[idx_ipv4]->arg, &value)) {
-               vty_out(vty, "Please specify Router-Addr by A.B.C.D\n");
-               return CMD_WARNING_CONFIG_FAILED;
-       }
-
-       isisMplsTE.router_id.s_addr = value.s_addr;
-
-       if (isisMplsTE.status == disable)
-               return CMD_SUCCESS;
-
-       /* Update main Router ID in isis global structure */
-       isis->router_id = value.s_addr;
-       /* And re-schedule LSP update */
-       for (ALL_LIST_ELEMENTS_RO(isis->area_list, node, area))
-               if (listcount(area->area_addrs) > 0)
-                       lsp_regenerate_schedule(area, area->is_type, 0);
-
-       return CMD_SUCCESS;
-}
-
-DEFUN (isis_mpls_te_inter_as,
-       isis_mpls_te_inter_as_cmd,
-       "mpls-te inter-as <level-1|level-1-2|level-2-only>",
-       MPLS_TE_STR
-       "Configure MPLS-TE Inter-AS support\n"
-       "AREA native mode self originate INTER-AS LSP with L1 only flooding scope)\n"
-       "AREA native mode self originate INTER-AS LSP with L1 and L2 flooding scope)\n"
-       "AS native mode self originate INTER-AS LSP with L2 only flooding scope\n")
-{
-       vty_out(vty, "Not yet supported\n");
-       return CMD_SUCCESS;
-}
-
-DEFUN (no_isis_mpls_te_inter_as,
-       no_isis_mpls_te_inter_as_cmd,
-       "no mpls-te inter-as",
-       NO_STR
-       "Disable the MPLS-TE functionality\n"
-       "Disable MPLS-TE Inter-AS support\n")
-{
-
-       vty_out(vty, "Not yet supported\n");
-       return CMD_SUCCESS;
-}
-
 DEFUN (show_isis_mpls_te_router,
        show_isis_mpls_te_router_cmd,
        "show " PROTO_NAME " mpls-te router",
@@ -1363,12 +1228,6 @@ void isis_mpls_te_init(void)
        /* Register new VTY commands */
        install_element(VIEW_NODE, &show_isis_mpls_te_router_cmd);
        install_element(VIEW_NODE, &show_isis_mpls_te_interface_cmd);
-
-       install_element(ROUTER_NODE, &isis_mpls_te_on_cmd);
-       install_element(ROUTER_NODE, &no_isis_mpls_te_on_cmd);
-       install_element(ROUTER_NODE, &isis_mpls_te_router_addr_cmd);
-       install_element(ROUTER_NODE, &isis_mpls_te_inter_as_cmd);
-       install_element(ROUTER_NODE, &no_isis_mpls_te_inter_as_cmd);
 #endif
 
        return;