Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[test_show_bgp_summary] Change prefixReceivedCount key due to Frr Update #2927

Merged
merged 1 commit into from
Feb 16, 2021

Conversation

AndriiLozovyi
Copy link
Contributor

Signed-off-by: Andrii-Yosafat Lozovyi [email protected]

Description of PR

Summary: On master Sonic test_show_bgp_summary fails with error KeyError: 'prefixReceivedCount. This happens due to recent update of FRR up to version 7.5, after which key prefixReceivedCount have changed to pfxRcd. So in order to make test pass on Sonic master key should be changed to pfxRcd. This wont affect released Sonic version, because it contains both keys.

SONiC.master.113-dirty-20210203.033203

"peers":{
    "10.0.0.57":{
      "remoteAs":64600,
      "version":4,
      "msgRcvd":3329,
      "msgSent":6529,
      "tableVersion":0,
      "outq":0,
      "inq":0,
      "peerUptime":"00:06:14",
      "peerUptimeMsec":374000,
      "peerUptimeEstablishedEpoch":1611333401,
      "pfxRcd":6400,
      "pfxSnt":6401,
      "state":"Established",
      "connectionsEstablished":1,
      "connectionsDropped":0,
      "idType":"ipv4"
    },

SONiC.201911.208-dirty-20210122.060940

"peers":{
    "10.0.0.57":{
      "remoteAs":64600,
      "version":4,
      "msgRcvd":3550,
      "msgSent":4690,
      "tableVersion":0,
      "outq":0,
      "inq":0,
      "peerUptime":"03:11:32",
      "peerUptimeMsec":11492000,
      "peerUptimeEstablishedEpoch":1611316346,
      "prefixReceivedCount":6400,
      "pfxRcd":6400,
      "state":"Established",
      "connectionsEstablished":1,
      "connectionsDropped":0,
      "idType":"ipv4"
    },

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Approach

What is the motivation for this PR?

Make test_show_bgp_summary backward compatible.

How did you do it?

Changed the prefixReceivedCount key.

How did you verify/test it?

Run test_show_bgp_summary on t0 topo
vrf/test_vrf.py::TestVrfFib::test_show_bgp_summary PASSED

Any platform specific information?

SONiC Software Version: SONiC.master.113-dirty-20210203.033203
Distribution: Debian 10.7
Kernel: 4.19.0-9-2-amd64
Build commit: f8ddc39a
Build date: Wed Feb  3 12:24:16 UTC 2021
Built by: johnar@worker-s453e80

Supported testbed topology if it's a new test case?

Documentation

@AndriiLozovyi AndriiLozovyi requested a review from a team as a code owner February 4, 2021 09:22
@SavchukRomanLv
Copy link
Contributor

retest vsimage please

@AndriiLozovyi
Copy link
Contributor Author

@yxieca @wangxin could you please take a look?

@yxieca
Copy link
Collaborator

yxieca commented Feb 12, 2021

@SavchukRomanLv thanks for address the issue. I noticed that 201911 branch is still not upgraded to FRR 7.5 yet. Do you think you can make the test work for both 201911 and master?

@AndriiLozovyi
Copy link
Contributor Author

@yxieca Test should work for both master and 201911, below is the output of show bgp summary json on SONiC.201911.220-dirty-20210205.115223 which also contains key pfxRcd

   "10.0.0.19":{
      "remoteAs":65200,
      "version":4,
      "msgRcvd":0,
      "msgSent":0,
      "tableVersion":0,
      "outq":0,
      "inq":0,
      "peerUptime":"never",
      "peerUptimeMsec":0,
      "prefixReceivedCount":0,
      "pfxRcd":0,
      "state":"Active",
      "connectionsEstablished":0,
      "connectionsDropped":0,
      "idType":"ipv4"
    },

@yxieca yxieca merged commit 70c7a95 into sonic-net:master Feb 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants