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.

Sign up for GitHub

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

Jump to bottom

[submodule update] sonic-sairedis to move to SAI1.8.1 #7393

Merged
merged 6 commits into from
Apr 22, 2021
Merged

[submodule update] sonic-sairedis to move to SAI1.8.1 #7393

merged 6 commits into from
Apr 22, 2021

Conversation

abdosi
Copy link
Contributor

@abdosi abdosi commented Apr 21, 2021 •
edited
Loading

What/Why I did:

  • Updated sonic-sairedis submodule to use SAI1.8.1
    [Submodule update] sonic-sairedis
d821bc0b137264daa01c347700c7c14677cf3370 (HEAD -> master, origin/master, origin/HEAD) [Mellanox] Add SAI template 
config support (#803)
bb341e9ea069e974a41930d434d437f522476f29 [syncd] Bring back TimerWatchdog (#821)
badf6cea2650015269420932a9186113d1ad5ec6 Update .gitignore (#822)
1494bc69046ffe7135377844548a11e4168b407c [meta] Mark local function static (#818)
34e961cf39e9af93f492f66640739e1c7a1694c8 [pyext] Fix pyext/py2 library (#820)
0d3749d3a93fd7e59ebb83b49fa1d7e2a56d6cf4 Moved SAI Header to git tag v1.8.1 (#816)
70fff780d529f78b53af4bd104f4932d0c4d8dd6 Added --purge of base docker image packages before installing new ones. (#819)
  • Updated Broadcom SAI Debian package to 4.3.3.4-2 to use SAI 1.8.1 Header

How I verify:
Basic sanity on Broadcom based platform with new debian package.

root@str-sxxxx-on-2:/# dpkg --list | grep sai
ii  libsaibcm                  4.3.3.4-2                   amd64        Switch Abstraction Interface sdk based on Broadcom SAI
ii  libsaimetadata             1.0.0                       amd64        This package contains SAI-Metadata implementation for SONiC project.
ii  libsairedis                1.0.0                       amd64        This package contains SAI-Redis implementation for SONiC project.
admin@str-sxxxx-on-2:~$ show interface status
      Interface            Lanes    Speed    MTU    FEC           Alias             Vlan    Oper    Admin            Type    Asym PFC
---------------  ---------------  -------  -----  -----  --------------  ---------------  ------  -------  --------------  ----------
      Ethernet0      25,26,27,28      40G   9100    N/A    fortyGigE0/0  PortChannel0002      up       up  QSFP+ or later         off
      Ethernet4      29,30,31,32      40G   9100    N/A    fortyGigE0/4  PortChannel0002      up       up  QSFP+ or later         off
      Ethernet8      33,34,35,36      40G   9100    N/A    fortyGigE0/8  PortChannel0005      up       up  QSFP+ or later         off
     Ethernet12      37,38,39,40      40G   9100    N/A   fortyGigE0/12  PortChannel0005      up       up  QSFP+ or later         off
     Ethernet16      45,46,47,48      40G   9100    N/A   fortyGigE0/16  PortChannel0008      up       up  QSFP+ or later         off
     Ethernet20      41,42,43,44      40G   9100    N/A   fortyGigE0/20  PortChannel0008      up       up  QSFP+ or later         off
     Ethernet24          1,2,3,4      40G   9100    N/A   fortyGigE0/24  PortChannel0011      up       up  QSFP+ or later         off
     Ethernet28          5,6,7,8      40G   9100    N/A   fortyGigE0/28  PortChannel0011      up       up  QSFP+ or later         off
     Ethernet32      13,14,15,16      40G   9100    N/A   fortyGigE0/32  PortChannel0014      up       up  QSFP+ or later         off
     Ethernet36       9,10,11,12      40G   9100    N/A   fortyGigE0/36  PortChannel0014      up       up  QSFP+ or later         off
     Ethernet40      17,18,19,20      40G   9100    N/A   fortyGigE0/40  PortChannel0017      up       up  QSFP+ or later         off
     Ethernet44      21,22,23,24      40G   9100    N/A   fortyGigE0/44  PortChannel0017      up       up  QSFP+ or later         off

admin@str-sxxxx-on-2:~$ show lldp table
Capability codes: (R) Router, (B) Bridge, (O) Other
LocalPort    RemoteDevice      RemotePortID    Capability    RemotePortDescr
-----------  ----------------  --------------  ------------  -----------------
Ethernet0    ARISTA01T2        Ethernet2       BR
Ethernet4    ARISTA01T2        Ethernet1       BR
Ethernet8    ARISTA03T2        Ethernet2       BR
Ethernet12   ARISTA03T2        Ethernet1       BR
Ethernet16   ARISTA05T2        Ethernet2       BR
Ethernet20   ARISTA05T2        Ethernet1       BR
Ethernet24   ARISTA07T2        Ethernet2       BR
Ethernet28   ARISTA07T2        Ethernet1       BR
Ethernet32   ARISTA09T2        Ethernet2       BR
Ethernet36   ARISTA09T2        Ethernet1       BR
Ethernet40   ARISTA11T2        Ethernet2       BR
Ethernet44   ARISTA11T2        Ethernet1       BR

@abdosi
[submodule update] sonic-db-syncd
4766fcf 
df46ed418e661a9bccdb2639d8873def356f8ba0 (HEAD -> master, origin/master, origin/HEAD) Fix the LLDP_LOC_CHASSIS not getting populated if no remote neighbors are present (sonic-net#39)
e487532e11cc0e97cfce573b6b997fdd0beeb660 [CI] Set up CI&PR with Azure Pipelines (sonic-net#38)
3c9f488490a1dbded20dbf2d8a88a5ab4dbda8df Replace swsssdk's SonicV2Connector with swsscommon's implementation (sonic-net#35)

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
@abdosi
Merge remote-tracking branch 'upsteam/master'
9746bb3
@abdosi
Merge remote-tracking branch 'upsteam/master'
061821d
@abdosi
Merge remote-tracking branch 'upsteam/master'
9e61e53
@abdosi
[Submodule update] sonic-sairedis
86abb57 
d821bc0 (HEAD -> master, origin/master, origin/HEAD) [Mellanox] Add SAI template config support (sonic-net#803)
bb341e9 [syncd] Bring back TimerWatchdog (sonic-net#821)
badf6ce Update .gitignore (sonic-net#822)
1494bc6 [meta] Mark local function static (sonic-net#818)
34e961c [pyext] Fix pyext/py2 library (sonic-net#820)
0d3749d Moved SAI Header to git tag v1.8.1 (sonic-net#816)
70fff78 Added --purge of base docker image packages before installing new ones. (sonic-net#819)

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
@abdosi
Brodcom SAI debian compile with SAI1.8.1
25c1624 
Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
@abdosi abdosi requested a review from lguohan as a code owner April 21, 2021 14:38
@abdosi abdosi requested a review from gechiang April 21, 2021 14:40
@gechiang
Copy link
Collaborator

Looks like some test failure with advanced reboot... not sure if it is due to testcase issue:

E                   "======================================================================", 
E                   "FAIL: advanced-reboot.ReloadTest", 
E                   "----------------------------------------------------------------------", 
E                   "Traceback (most recent call last):", 
E                   "  File \"ptftests/advanced-reboot.py\", line 1176, in runTest", 
E                   "    self.handle_post_reboot_test_reports()", 
E                   "  File \"ptftests/advanced-reboot.py\", line 1127, in handle_post_reboot_test_reports", 
E                   "    self.assertTrue(is_good, errors)", 
E                   "AssertionError: ", 
E                   "", 
E                   "Something went wrong. Please check output below:", 
E                   "", 
E                   "FAILED:dut:Control plane didn't come up within warm up timeout", 
E                   "FAILED:dut:DUT is not ready for test",

Let me try re-run it again and see what happens...

@abdosi
Copy link
Contributor Author

abdosi commented Apr 21, 2021

Looks like some test failure with advanced reboot... not sure if it is due to testcase issue:

E                   "======================================================================", 
E                   "FAIL: advanced-reboot.ReloadTest", 
E                   "----------------------------------------------------------------------", 
E                   "Traceback (most recent call last):", 
E                   "  File \"ptftests/advanced-reboot.py\", line 1176, in runTest", 
E                   "    self.handle_post_reboot_test_reports()", 
E                   "  File \"ptftests/advanced-reboot.py\", line 1127, in handle_post_reboot_test_reports", 
E                   "    self.assertTrue(is_good, errors)", 
E                   "AssertionError: ", 
E                   "", 
E                   "Something went wrong. Please check output below:", 
E                   "", 
E                   "FAILED:dut:Control plane didn't come up within warm up timeout", 
E                   "FAILED:dut:DUT is not ready for test",

Let me try re-run it again and see what happens...

@gechiang yes this test is flaky. have started re-run.

@abdosi abdosi merged commit ee98b17 into sonic-net:master Apr 22, 2021
@abdosi abdosi deleted the sai1.8.1 branch April 22, 2021 00:41
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request May 23, 2021
@abdosi @raphaelt-nvidia
[submodule update] sonic-sairedis to move to SAI1.8.1 (sonic-net#7393)
efb9e83 
What/Why I did:

Updated sonic-sairedis submodule to use SAI1.8.1
[Submodule update] sonic-sairedis
d821bc0 (HEAD -> master, origin/master, origin/HEAD) [Mellanox] Add SAI template 
config support (sonic-net#803)
bb341e9 [syncd] Bring back TimerWatchdog (sonic-net#821)
badf6ce Update .gitignore (sonic-net#822)
1494bc6 [meta] Mark local function static (sonic-net#818)
34e961c [pyext] Fix pyext/py2 library (sonic-net#820)
0d3749d Moved SAI Header to git tag v1.8.1 (sonic-net#816)
70fff78 Added --purge of base docker image packages before installing new ones. (sonic-net#819)

Updated Broadcom SAI Debian package to 4.3.3.4-2 to use SAI 1.8.1 Header
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
@abdosi
[submodule update] sonic-sairedis to move to SAI1.8.1 (sonic-net#7393)
eda7130 
What/Why I did:

Updated sonic-sairedis submodule to use SAI1.8.1
[Submodule update] sonic-sairedis
d821bc0 (HEAD -> master, origin/master, origin/HEAD) [Mellanox] Add SAI template 
config support (sonic-net#803)
bb341e9 [syncd] Bring back TimerWatchdog (sonic-net#821)
badf6ce Update .gitignore (sonic-net#822)
1494bc6 [meta] Mark local function static (sonic-net#818)
34e961c [pyext] Fix pyext/py2 library (sonic-net#820)
0d3749d Moved SAI Header to git tag v1.8.1 (sonic-net#816)
70fff78 Added --purge of base docker image packages before installing new ones. (sonic-net#819)

Updated Broadcom SAI Debian package to 4.3.3.4-2 to use SAI 1.8.1 Header
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gechiang gechiang gechiang approved these changes

@lguohan lguohan Awaiting requested review from lguohan lguohan is a code owner

@vmittal-msft vmittal-msft Awaiting requested review from vmittal-msft

Assignees
No one assigned
Labels
Submodule Update ⏫
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@abdosi @gechiang