Skip to content

Commit 8a3cfe1

Browse files
Revert "[config/show] Add command to control pending FIB suppression (sonic-net#2495)"
This reverts commit 9126e7f.
1 parent 556026c commit 8a3cfe1

File tree

4 files changed

+6
-101
lines changed

4 files changed

+6
-101
lines changed

config/main.py

+2-14
Original file line numberDiff line numberDiff line change
@@ -1902,7 +1902,7 @@ def load_minigraph(db, no_service_restart, traffic_shift_away, override_config,
19021902
cfggen_namespace_option = ['-n', str(namespace)]
19031903
clicommon.run_command([db_migrator, '-o', 'set_version'] + cfggen_namespace_option)
19041904

1905-
# Keep device isolated with TSA
1905+
# Keep device isolated with TSA
19061906
if traffic_shift_away:
19071907
clicommon.run_command(["TSA"], display_cmd=True)
19081908
if override_config:
@@ -2214,21 +2214,9 @@ def synchronous_mode(sync_mode):
22142214
config reload -y \n
22152215
Option 2. systemctl restart swss""" % sync_mode)
22162216

2217-
#
2218-
# 'suppress-fib-pending' command ('config suppress-fib-pending ...')
2219-
#
2220-
@config.command('suppress-fib-pending')
2221-
@click.argument('state', metavar='<enabled|disabled>', required=True, type=click.Choice(['enabled', 'disabled']))
2222-
@clicommon.pass_db
2223-
def suppress_pending_fib(db, state):
2224-
''' Enable or disable pending FIB suppression. Once enabled, BGP will not advertise routes that are not yet installed in the hardware '''
2225-
2226-
config_db = db.cfgdb
2227-
config_db.mod_entry('DEVICE_METADATA' , 'localhost', {"suppress-fib-pending" : state})
2228-
22292217
#
22302218
# 'yang_config_validation' command ('config yang_config_validation ...')
2231-
#
2219+
#
22322220
@config.command('yang_config_validation')
22332221
@click.argument('yang_config_validation', metavar='<enable|disable>', required=True)
22342222
def yang_config_validation(yang_config_validation):

doc/Command-Reference.md

-38
Original file line numberDiff line numberDiff line change
@@ -2610,26 +2610,6 @@ This command displays the routing policy that takes precedence over the other ro
26102610
Exit routemap
26112611
```
26122612
2613-
**show suppress-fib-pending**
2614-
2615-
This command is used to show the status of suppress pending FIB feature.
2616-
When enabled, BGP will not advertise routes which aren't yet offloaded.
2617-
2618-
- Usage:
2619-
```
2620-
show suppress-fib-pending
2621-
```
2622-
2623-
- Examples:
2624-
```
2625-
admin@sonic:~$ show suppress-fib-pending
2626-
Enabled
2627-
```
2628-
```
2629-
admin@sonic:~$ show suppress-fib-pending
2630-
Disabled
2631-
```
2632-
26332613
Go Back To [Beginning of the document](#) or [Beginning of this section](#bgp)
26342614
26352615
### BGP config commands
@@ -2722,24 +2702,6 @@ This command is used to remove particular IPv4 or IPv6 BGP neighbor configuratio
27222702
admin@sonic:~$ sudo config bgp remove neighbor SONIC02SPINE
27232703
```
27242704
2725-
**config suppress-fib-pending**
2726-
2727-
This command is used to enable or disable announcements of routes not yet installed in the HW.
2728-
Once enabled, BGP will not advertise routes which aren't yet offloaded.
2729-
2730-
- Usage:
2731-
```
2732-
config suppress-fib-pending <enabled|disabled>
2733-
```
2734-
2735-
- Examples:
2736-
```
2737-
admin@sonic:~$ sudo config suppress-fib-pending enabled
2738-
```
2739-
```
2740-
admin@sonic:~$ sudo config suppress-fib-pending disabled
2741-
```
2742-
27432705
Go Back To [Beginning of the document](#) or [Beginning of this section](#bgp)
27442706
27452707
## Console

show/main.py

+4-15
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def get_config_json_by_namespace(namespace):
164164
iface_alias_converter = lazy_object_proxy.Proxy(lambda: clicommon.InterfaceAliasConverter())
165165

166166
#
167-
# Display all storm-control data
167+
# Display all storm-control data
168168
#
169169
def display_storm_all():
170170
""" Show storm-control """
@@ -462,7 +462,7 @@ def is_mgmt_vrf_enabled(ctx):
462462
return False
463463

464464
#
465-
# 'storm-control' group
465+
# 'storm-control' group
466466
# "show storm-control [interface <interface>]"
467467
#
468468
@cli.group('storm-control', invoke_without_command=True)
@@ -2108,7 +2108,7 @@ def summary(db):
21082108
key_values = key.split('|')
21092109
values = db.db.get_all(db.db.STATE_DB, key)
21102110
if "local_discriminator" not in values.keys():
2111-
values["local_discriminator"] = "NA"
2111+
values["local_discriminator"] = "NA"
21122112
bfd_body.append([key_values[3], key_values[2], key_values[1], values["state"], values["type"], values["local_addr"],
21132113
values["tx_interval"], values["rx_interval"], values["multiplier"], values["multihop"], values["local_discriminator"]])
21142114

@@ -2139,24 +2139,13 @@ def peer(db, peer_ip):
21392139
key_values = key.split(delimiter)
21402140
values = db.db.get_all(db.db.STATE_DB, key)
21412141
if "local_discriminator" not in values.keys():
2142-
values["local_discriminator"] = "NA"
2142+
values["local_discriminator"] = "NA"
21432143
bfd_body.append([key_values[3], key_values[2], key_values[1], values.get("state"), values.get("type"), values.get("local_addr"),
21442144
values.get("tx_interval"), values.get("rx_interval"), values.get("multiplier"), values.get("multihop"), values.get("local_discriminator")])
21452145

21462146
click.echo(tabulate(bfd_body, bfd_headers))
21472147

21482148

2149-
# 'suppress-fib-pending' subcommand ("show suppress-fib-pending")
2150-
@cli.command('suppress-fib-pending')
2151-
@clicommon.pass_db
2152-
def suppress_pending_fib(db):
2153-
""" Show the status of suppress pending FIB feature """
2154-
2155-
field_values = db.cfgdb.get_entry('DEVICE_METADATA', 'localhost')
2156-
state = field_values.get('suppress-fib-pending', 'disabled').title()
2157-
click.echo(state)
2158-
2159-
21602149
# asic-sdk-health-event subcommand ("show asic-sdk-health-event")
21612150
@cli.group(cls=clicommon.AliasedGroup)
21622151
def asic_sdk_health_event():

tests/suppress_pending_fib_test.py

-34
This file was deleted.

0 commit comments

Comments
 (0)