From 1bf062e1b4a1f4948e5dcd4b7f6fc0af7b758976 Mon Sep 17 00:00:00 2001 From: Igor Ryzhov Date: Fri, 14 May 2021 02:08:11 +0300 Subject: [PATCH] Revert "bgpd: add nb support for suppress-map in aggregate cmd" This reverts commit 90e21f3535ff2d887cbb52f0e4e6fe4907095d70. Signed-off-by: Igor Ryzhov --- bgpd/bgp_nb.c | 30 ---------- bgpd/bgp_nb.h | 16 ----- bgpd/bgp_nb_config.c | 139 ------------------------------------------- bgpd/bgp_route.c | 24 +------- 4 files changed, 2 insertions(+), 207 deletions(-) diff --git a/bgpd/bgp_nb.c b/bgpd/bgp_nb.c index 09c20b55db..0f777aa9b9 100644 --- a/bgpd/bgp_nb.c +++ b/bgpd/bgp_nb.c @@ -1353,13 +1353,6 @@ const struct frr_yang_module_info frr_bgp_info = { .modify = bgp_global_afi_safis_afi_safi_ipv4_unicast_aggregate_route_match_med_modify, } }, - { - .xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv4-unicast/aggregate-route/suppress-map", - .cbs = { - .modify = bgp_global_afi_safis_afi_safi_ipv4_unicast_aggregate_route_suppress_map_modify, - .destroy = bgp_global_afi_safis_afi_safi_ipv4_unicast_aggregate_route_suppress_map_destroy, - } - }, { .xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv4-unicast/admin-distance-route", .cbs = { @@ -1670,13 +1663,6 @@ const struct frr_yang_module_info frr_bgp_info = { .modify = bgp_global_afi_safis_afi_safi_ipv6_unicast_aggregate_route_match_med_modify, } }, - { - .xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv6-unicast/aggregate-route/suppress-map", - .cbs = { - .modify = bgp_global_afi_safis_afi_safi_ipv6_unicast_aggregate_route_suppress_map_modify, - .destroy = bgp_global_afi_safis_afi_safi_ipv6_unicast_aggregate_route_suppress_map_destroy, - } - }, { .xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv6-unicast/admin-distance-route", .cbs = { @@ -2081,7 +2067,6 @@ const struct frr_yang_module_info frr_bgp_info = { { .xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv4-multicast/aggregate-route", .cbs = { - .apply_finish = bgp_global_afi_safi_aggregate_route_apply_finish, .create = bgp_global_afi_safis_afi_safi_ipv4_multicast_aggregate_route_create, .destroy = bgp_global_afi_safis_afi_safi_ipv4_multicast_aggregate_route_destroy, } @@ -2117,13 +2102,6 @@ const struct frr_yang_module_info frr_bgp_info = { .modify = bgp_global_afi_safis_afi_safi_ipv4_multicast_aggregate_route_match_med_modify, } }, - { - .xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv4-multicast/aggregate-route/suppress-map", - .cbs = { - .modify = bgp_global_afi_safis_afi_safi_ipv4_multicast_aggregate_route_suppress_map_modify, - .destroy = bgp_global_afi_safis_afi_safi_ipv4_multicast_aggregate_route_suppress_map_destroy, - } - }, { .xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv4-multicast/admin-distance-route", .cbs = { @@ -2250,7 +2228,6 @@ const struct frr_yang_module_info frr_bgp_info = { { .xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv6-multicast/aggregate-route", .cbs = { - .apply_finish = bgp_global_afi_safi_aggregate_route_apply_finish, .create = bgp_global_afi_safis_afi_safi_ipv6_multicast_aggregate_route_create, .destroy = bgp_global_afi_safis_afi_safi_ipv6_multicast_aggregate_route_destroy, } @@ -2286,13 +2263,6 @@ const struct frr_yang_module_info frr_bgp_info = { .modify = bgp_global_afi_safis_afi_safi_ipv6_multicast_aggregate_route_match_med_modify, } }, - { - .xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv6-multicast/aggregate-route/suppress-map", - .cbs = { - .modify = bgp_global_afi_safis_afi_safi_ipv6_multicast_aggregate_route_suppress_map_modify, - .destroy = bgp_global_afi_safis_afi_safi_ipv6_multicast_aggregate_route_suppress_map_destroy, - } - }, { .xpath = "/frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv6-multicast/admin-distance-route", .cbs = { diff --git a/bgpd/bgp_nb.h b/bgpd/bgp_nb.h index dcd49712f2..122df49d09 100644 --- a/bgpd/bgp_nb.h +++ b/bgpd/bgp_nb.h @@ -567,10 +567,6 @@ int bgp_global_afi_safis_afi_safi_ipv4_unicast_aggregate_route_origin_modify( struct nb_cb_modify_args *args); int bgp_global_afi_safis_afi_safi_ipv4_unicast_aggregate_route_match_med_modify( struct nb_cb_modify_args *args); -int bgp_global_afi_safis_afi_safi_ipv4_unicast_aggregate_route_suppress_map_modify( - struct nb_cb_modify_args *args); -int bgp_global_afi_safis_afi_safi_ipv4_unicast_aggregate_route_suppress_map_destroy( - struct nb_cb_destroy_args *args); int bgp_global_afi_safis_afi_safi_ipv4_unicast_admin_distance_route_create( struct nb_cb_create_args *args); int bgp_global_afi_safis_afi_safi_ipv4_unicast_admin_distance_route_destroy( @@ -707,10 +703,6 @@ int bgp_global_afi_safis_afi_safi_ipv6_unicast_aggregate_route_origin_modify( struct nb_cb_modify_args *args); int bgp_global_afi_safis_afi_safi_ipv6_unicast_aggregate_route_match_med_modify( struct nb_cb_modify_args *args); -int bgp_global_afi_safis_afi_safi_ipv6_unicast_aggregate_route_suppress_map_modify( - struct nb_cb_modify_args *args); -int bgp_global_afi_safis_afi_safi_ipv6_unicast_aggregate_route_suppress_map_destroy( - struct nb_cb_destroy_args *args); int bgp_global_afi_safis_afi_safi_ipv6_unicast_admin_distance_route_create( struct nb_cb_create_args *args); int bgp_global_afi_safis_afi_safi_ipv6_unicast_admin_distance_route_destroy( @@ -901,10 +893,6 @@ int bgp_global_afi_safis_afi_safi_ipv4_multicast_aggregate_route_origin_modify( struct nb_cb_modify_args *args); int bgp_global_afi_safis_afi_safi_ipv4_multicast_aggregate_route_match_med_modify( struct nb_cb_modify_args *args); -int bgp_global_afi_safis_afi_safi_ipv4_multicast_aggregate_route_suppress_map_modify( - struct nb_cb_modify_args *args); -int bgp_global_afi_safis_afi_safi_ipv4_multicast_aggregate_route_suppress_map_destroy( - struct nb_cb_destroy_args *args); int bgp_global_afi_safis_afi_safi_ipv4_multicast_admin_distance_route_create( struct nb_cb_create_args *args); int bgp_global_afi_safis_afi_safi_ipv4_multicast_admin_distance_route_destroy( @@ -973,10 +961,6 @@ int bgp_global_afi_safis_afi_safi_ipv6_multicast_aggregate_route_origin_modify( struct nb_cb_modify_args *args); int bgp_global_afi_safis_afi_safi_ipv6_multicast_aggregate_route_match_med_modify( struct nb_cb_modify_args *args); -int bgp_global_afi_safis_afi_safi_ipv6_multicast_aggregate_route_suppress_map_modify( - struct nb_cb_modify_args *args); -int bgp_global_afi_safis_afi_safi_ipv6_multicast_aggregate_route_suppress_map_destroy( - struct nb_cb_destroy_args *args); int bgp_global_afi_safis_afi_safi_ipv6_multicast_admin_distance_route_create( struct nb_cb_create_args *args); int bgp_global_afi_safis_afi_safi_ipv6_multicast_admin_distance_route_destroy( diff --git a/bgpd/bgp_nb_config.c b/bgpd/bgp_nb_config.c index a053264025..699a2b2aa5 100644 --- a/bgpd/bgp_nb_config.c +++ b/bgpd/bgp_nb_config.c @@ -5721,9 +5721,6 @@ void bgp_global_afi_safi_aggregate_route_apply_finish( origin = yang_dnode_get_enum(args->dnode, "./origin"); match_med = yang_dnode_get_bool(args->dnode, "./match-med"); - if (yang_dnode_exists(args->dnode, "./suppress-map")) - suppress_map = - yang_dnode_get_string(args->dnode, "./suppress-map"); bgp_aggregate_set(bgp, &prefix, afi, safi, rmap_name, summary_only, as_set, origin, match_med, suppress_map, args->errmsg, @@ -5901,40 +5898,6 @@ int bgp_global_afi_safis_afi_safi_ipv4_unicast_aggregate_route_match_med_modify( return NB_OK; } -/* - * XPath: - * /frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv4-unicast/aggregate-route/suppress-map - */ -int bgp_global_afi_safis_afi_safi_ipv4_unicast_aggregate_route_suppress_map_modify( - struct nb_cb_modify_args *args) -{ - switch (args->event) { - case NB_EV_VALIDATE: - case NB_EV_PREPARE: - case NB_EV_ABORT: - case NB_EV_APPLY: - /* TODO: implement me. */ - break; - } - - return NB_OK; -} - -int bgp_global_afi_safis_afi_safi_ipv4_unicast_aggregate_route_suppress_map_destroy( - struct nb_cb_destroy_args *args) -{ - switch (args->event) { - case NB_EV_VALIDATE: - case NB_EV_PREPARE: - case NB_EV_ABORT: - case NB_EV_APPLY: - /* TODO: implement me. */ - break; - } - - return NB_OK; -} - void bgp_global_afi_safi_admin_distance_route_apply_finish( struct nb_cb_apply_finish_args *args) { @@ -7975,40 +7938,6 @@ int bgp_global_afi_safis_afi_safi_ipv6_unicast_aggregate_route_match_med_modify( return NB_OK; } -/* - * XPath: - * /frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv6-unicast/aggregate-route/suppress-map - */ -int bgp_global_afi_safis_afi_safi_ipv6_unicast_aggregate_route_suppress_map_modify( - struct nb_cb_modify_args *args) -{ - switch (args->event) { - case NB_EV_VALIDATE: - case NB_EV_PREPARE: - case NB_EV_ABORT: - case NB_EV_APPLY: - /* TODO: implement me. */ - break; - } - - return NB_OK; -} - -int bgp_global_afi_safis_afi_safi_ipv6_unicast_aggregate_route_suppress_map_destroy( - struct nb_cb_destroy_args *args) -{ - switch (args->event) { - case NB_EV_VALIDATE: - case NB_EV_PREPARE: - case NB_EV_ABORT: - case NB_EV_APPLY: - /* TODO: implement me. */ - break; - } - - return NB_OK; -} - /* * XPath: * /frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv6-unicast/admin-distance-route @@ -9814,40 +9743,6 @@ int bgp_global_afi_safis_afi_safi_ipv4_multicast_aggregate_route_match_med_modif return NB_OK; } -/* - * XPath: - * /frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv4-multicast/aggregate-route/suppress-map - */ -int bgp_global_afi_safis_afi_safi_ipv4_multicast_aggregate_route_suppress_map_modify( - struct nb_cb_modify_args *args) -{ - switch (args->event) { - case NB_EV_VALIDATE: - case NB_EV_PREPARE: - case NB_EV_ABORT: - case NB_EV_APPLY: - /* TODO: implement me. */ - break; - } - - return NB_OK; -} - -int bgp_global_afi_safis_afi_safi_ipv4_multicast_aggregate_route_suppress_map_destroy( - struct nb_cb_destroy_args *args) -{ - switch (args->event) { - case NB_EV_VALIDATE: - case NB_EV_PREPARE: - case NB_EV_ABORT: - case NB_EV_APPLY: - /* TODO: implement me. */ - break; - } - - return NB_OK; -} - /* * XPath: * /frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv4-multicast/admin-distance-route @@ -10639,40 +10534,6 @@ int bgp_global_afi_safis_afi_safi_ipv6_multicast_aggregate_route_match_med_modif return NB_OK; } -/* - * XPath: - * /frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv6-multicast/aggregate-route/suppress-map - */ -int bgp_global_afi_safis_afi_safi_ipv6_multicast_aggregate_route_suppress_map_modify( - struct nb_cb_modify_args *args) -{ - switch (args->event) { - case NB_EV_VALIDATE: - case NB_EV_PREPARE: - case NB_EV_ABORT: - case NB_EV_APPLY: - /* TODO: implement me. */ - break; - } - - return NB_OK; -} - -int bgp_global_afi_safis_afi_safi_ipv6_multicast_aggregate_route_suppress_map_destroy( - struct nb_cb_destroy_args *args) -{ - switch (args->event) { - case NB_EV_VALIDATE: - case NB_EV_PREPARE: - case NB_EV_ABORT: - case NB_EV_APPLY: - /* TODO: implement me. */ - break; - } - - return NB_OK; -} - /* * XPath: * /frr-routing:routing/control-plane-protocols/control-plane-protocol/frr-bgp:bgp/global/afi-safis/afi-safi/ipv6-multicast/admin-distance-route diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 4299ea3525..92b64d9e0f 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -8014,7 +8014,6 @@ DEFPY_YANG( "|route-map WORD$rmap_name" "|origin $origin_s" "|matching-MED-only$match_med" - "|suppress-map WORD$suppress_map" "}]", NO_STR "Configure BGP aggregate entries\n" @@ -8029,9 +8028,7 @@ DEFPY_YANG( "Remote EGP\n" "Local IGP\n" "Unknown heritage\n" - "Only aggregate routes with matching MED\n" - "Suppress the selected more specific routes\n" - "Route map with the route selectors\n") + "Only aggregate routes with matching MED\n") { char base_xpath[XPATH_MAXLEN]; safi_t safi = bgp_node_safi(vty); @@ -8076,13 +8073,6 @@ DEFPY_YANG( nb_cli_enqueue_change(vty, "./rmap-policy-export", NB_OP_DESTROY, NULL); - if (suppress_map) - nb_cli_enqueue_change(vty, "./suppress-map", NB_OP_MODIFY, - suppress_map); - else - nb_cli_enqueue_change(vty, "./suppress-map", NB_OP_DESTROY, - NULL); - snprintf( base_xpath, sizeof(base_xpath), "./global/afi-safis/afi-safi[afi-safi-name='%s']/%s/aggregate-route[prefix='%s']", @@ -8104,7 +8094,6 @@ DEFPY_YANG(aggregate_addressv6, aggregate_addressv6_cmd, "|route-map WORD$rmap_name" "|origin $origin_s" "|matching-MED-only$match_med" - "|suppress-map WORD$suppress_map" "}]", NO_STR "Configure BGP aggregate entries\n" @@ -8117,9 +8106,7 @@ DEFPY_YANG(aggregate_addressv6, aggregate_addressv6_cmd, "Remote EGP\n" "Local IGP\n" "Unknown heritage\n" - "Only aggregate routes with matching MED\n" - "Suppress the selected more specific routes\n" - "Route map with the route selectors\n") + "Only aggregate routes with matching MED\n") { char base_xpath[XPATH_MAXLEN]; safi_t safi = bgp_node_safi(vty); @@ -8149,13 +8136,6 @@ DEFPY_YANG(aggregate_addressv6, aggregate_addressv6_cmd, nb_cli_enqueue_change(vty, "./rmap-policy-export", NB_OP_MODIFY, rmap_name); - if (suppress_map) - nb_cli_enqueue_change(vty, "./suppress-map", NB_OP_MODIFY, - suppress_map); - else - nb_cli_enqueue_change(vty, "./suppress-map", NB_OP_DESTROY, - NULL); - snprintf( base_xpath, sizeof(base_xpath), "./global/afi-safis/afi-safi[afi-safi-name='%s']/%s/aggregate-route[prefix='%s']", -- 2.39.5