Skip to content

[202012] avoid printing error if no neighbors are present#2594

Merged
arlakshm merged 1 commit intosonic-net:202012from
arlakshm:arlakshm/github/202012/fix_2502
Jan 13, 2023
Merged

[202012] avoid printing error if no neighbors are present#2594
arlakshm merged 1 commit intosonic-net:202012from
arlakshm:arlakshm/github/202012/fix_2502

Conversation

@arlakshm
Copy link
Contributor

@arlakshm arlakshm commented Jan 13, 2023 •
edited
Loading

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan arlakshm@microsoft.com

What I did

Fix #2492. port #2502 in 202012 branch

How I did it

Use click.echo and exit instead of ctx.fail in cli handler when no neighbor information is returned from bgp container.

How to verify it

Test on target and add UT
new output when no neighbors are present

admin@vlab-01:~$ show version

SONiC Software Version: SONiC.202012.202057-b111cecf0
Distribution: Debian 10.13
Kernel: 4.19.0-12-2-amd64
Build commit: b111cecf0
Build date: Thu Jan 12 12:18:18 UTC 2023
Built by: AzDevOps@vmss-soni000AO0

Platform: x86_64-kvm_x86_64-r0
HwSKU: Force10-S6000
ASIC: vs
ASIC Count: 1
Serial Number: 000000
Uptime: 00:04:12 up  2:26,  1 user,  load average: 0.30, 0.21, 0.19

Docker images:
REPOSITORY                    TAG                       IMAGE ID            SIZE
docker-sonic-mgmt-framework   202012.202057-b111cecf0   5794cb357e98        688MB
docker-sonic-mgmt-framework   latest                    5794cb357e98        688MB
docker-sonic-telemetry        202012.202057-b111cecf0   41410937da23        452MB
docker-sonic-telemetry        latest                    41410937da23        452MB
docker-sflow                  202012.202057-b111cecf0   5652fd0ec085        375MB
docker-sflow                  latest                    5652fd0ec085        375MB
docker-teamd                  202012.202057-b111cecf0   0d8ec0fe02a6        374MB
docker-teamd                  latest                    0d8ec0fe02a6        374MB
docker-orchagent              202012.202057-b111cecf0   adbe5e3b4d3e        392MB
docker-orchagent              latest                    adbe5e3b4d3e        392MB
docker-fpm-frr                202012.202057-b111cecf0   c616d6c60a64        392MB
docker-fpm-frr                latest                    c616d6c60a64        392MB
docker-nat                    202012.202057-b111cecf0   fe2fe5a96166        376MB
docker-nat                    latest                    fe2fe5a96166        376MB
docker-gbsyncd-vs             202012.202057-b111cecf0   814a42269647        369MB
docker-gbsyncd-vs             latest                    814a42269647        369MB
docker-snmp                   202012.202057-b111cecf0   79def75c20b5        405MB
docker-snmp                   latest                    79def75c20b5        405MB
docker-platform-monitor       202012.202057-b111cecf0   868b11d10a59        544MB
docker-platform-monitor       latest                    868b11d10a59        544MB
docker-syncd-vs               202012.202057-b111cecf0   86c0ad53fbda        369MB
docker-syncd-vs               latest                    86c0ad53fbda        369MB
docker-router-advertiser      202012.202057-b111cecf0   35a37b25ccb9        362MB
docker-router-advertiser      latest                    35a37b25ccb9        362MB
docker-lldp                   202012.202057-b111cecf0   3d3a9a84668d        402MB
docker-lldp                   latest                    3d3a9a84668d        402MB
docker-database               202012.202057-b111cecf0   90137c4b5362        362MB
docker-database               latest                    90137c4b5362        362MB
docker-dhcp-relay             202012.202057-b111cecf0   586c47d3a09a        375MB
docker-dhcp-relay             latest                    586c47d3a09a        375MB
docker-mux                    202012.202057-b111cecf0   d6f54ccb76cf        415MB
docker-mux                    latest                    d6f54ccb76cf        415MB

admin@vlab-01:~$ show ipv6 bgp summary
No IPv6 neighbor is configured
admin@vlab-01:~$

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

@arlakshm
[202012] avoid printing error if no neighbors are present
149acef 
Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <arlakshm@microsoft.com>
gechiang
gechiang approved these changes Jan 13, 2023
View reviewed changes
Copy link
Contributor

@gechiang gechiang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@arlakshm arlakshm merged commit 678df5d into sonic-net:202012 Jan 13, 2023
@arlakshm arlakshm deleted the arlakshm/github/202012/fix_2502 branch January 13, 2023 01:06
@neethajohn neethajohn mentioned this pull request Jan 13, 2023
Merged
qiluo-msft pushed a commit to sonic-net/sonic-buildimage that referenced this pull request Jan 13, 2023
@neethajohn
Advance sonic-utilities submodule pointer (#13360)
94c689f 
This PR includes the following commits
```
b44e153 [202012]Revert "[config reload]: On dual ToR systems, cache ARP and FDB table (sonic-net/sonic-utilities#2490)
59f3025 Use github code scanning instead of LGTM (sonic-net/sonic-utilities#2530)
678df5d [202012] avoid printing error if no neighbors are present  (sonic-net/sonic-utilities#2594)
```
@liuh-80 liuh-80 mentioned this pull request Feb 2, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@neethajohn neethajohn neethajohn approved these changes

@gechiang gechiang gechiang approved these changes

@qiluo-msft qiluo-msft Awaiting requested review from qiluo-msft

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@arlakshm @neethajohn @gechiang