Skip to content

[202412][Broadcom] Upgrade xgs SAI version to 13.2.1.7#1669

Merged
r12f merged 1 commit intoAzure:202412from
sdszhang:upgrade_sai_202412
Sep 29, 2025
Merged

[202412][Broadcom] Upgrade xgs SAI version to 13.2.1.7#1669
r12f merged 1 commit intoAzure:202412from
sdszhang:upgrade_sai_202412

Conversation

@sdszhang
Copy link
Copy Markdown

Why I did it
This is a manual cherry-pick of sonic-net/sonic-buildimage#24105 24105
[202412] Upgrade xgs SAI version to 13.2.1.7 to include the following fixes:

[CS00012424807]: FDB entry causing bad port state when added after drop_counter is configured
[CS00012425264]: SRv6 uN USD decapsulation does not handle DSCP value of inner header properly
Work item tracking
Microsoft ADO (number only): 35118084
How I did it
Update xgs SAI version in sai.mk file.

@sdszhang sdszhang marked this pull request as draft September 26, 2025 06:07
@sdszhang sdszhang closed this Sep 26, 2025
@sdszhang sdszhang reopened this Sep 26, 2025
@sdszhang sdszhang changed the base branch from master to 202412 September 26, 2025 06:09
@sdszhang sdszhang marked this pull request as ready for review September 26, 2025 06:10
@r12f
Copy link
Copy Markdown

r12f commented Sep 26, 2025

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@sdszhang
Copy link
Copy Markdown
Author

@qiluo-msft , the pipeline failed with the following failure. Can you help to take a look?

error[E0412]: cannot find type `SWSSSonicV2Connector` in this scope
 --> /var/azureuser/.cargo/git/checkouts/sonic-swss-common-f127700b9bf1a3a6/36a8519/crates/swss-common/src/types/sonicv2connector.rs:8:21
  |
8 |     pub(crate) ptr: SWSSSonicV2Connector,
  |                     ^^^^^^^^^^^^^^^^^^^^ not found in this scope

error[E0425]: cannot find function, tuple struct or tuple variant `SWSSSonicV2Connector_new` in this scope
   --> /var/azureuser/.cargo/git/checkouts/sonic-swss-common-f127700b9bf1a3a6/36a8519/crates/swss-common/src/types/sonicv2connector.rs:28:38
    |
28  |               swss_try!(p_connector => SWSSSonicV2Connector_new(
    |                                        ^^^^^^^^^^^^^^^^^^^^^^^^ help: a function with a similar name exists: `SWSSConfigDBConnector_new`
    |
   ::: /sonic/src/sonic-swss/target/release/build/swss-common-05542d0f664e4f5d/out/bindings.rs:832:5
    |
832 | /     pub fn SWSSConfigDBConnector_new(
833 | |         use_unix_socket_path: u8,
834 | |         netns: *const ::std::os::raw::c_char,
835 | |         outConfigDb: *mut SWSSConfigDBConnector,
836 | |     ) -> SWSSResult;
    | |____________________- similarly named function `SWSSConfigDBConnector_new` defined here

@qiluo-msft
Copy link
Copy Markdown
Member

@qiluo-msft , the pipeline failed with the following failure. Can you help to take a look?

error[E0412]: cannot find type `SWSSSonicV2Connector` in this scope
 --> /var/azureuser/.cargo/git/checkouts/sonic-swss-common-f127700b9bf1a3a6/36a8519/crates/swss-common/src/types/sonicv2connector.rs:8:21
  |
8 |     pub(crate) ptr: SWSSSonicV2Connector,
  |                     ^^^^^^^^^^^^^^^^^^^^ not found in this scope

error[E0425]: cannot find function, tuple struct or tuple variant `SWSSSonicV2Connector_new` in this scope
   --> /var/azureuser/.cargo/git/checkouts/sonic-swss-common-f127700b9bf1a3a6/36a8519/crates/swss-common/src/types/sonicv2connector.rs:28:38
    |
28  |               swss_try!(p_connector => SWSSSonicV2Connector_new(
    |                                        ^^^^^^^^^^^^^^^^^^^^^^^^ help: a function with a similar name exists: `SWSSConfigDBConnector_new`
    |
   ::: /sonic/src/sonic-swss/target/release/build/swss-common-05542d0f664e4f5d/out/bindings.rs:832:5
    |
832 | /     pub fn SWSSConfigDBConnector_new(
833 | |         use_unix_socket_path: u8,
834 | |         netns: *const ::std::os::raw::c_char,
835 | |         outConfigDb: *mut SWSSConfigDBConnector,
836 | |     ) -> SWSSResult;
    | |____________________- similarly named function `SWSSConfigDBConnector_new` defined here

Azure/sonic-swss.msft#157

[Broadcom] Upgrade xgs SAI version to 13.2.1.7
@sdszhang
Copy link
Copy Markdown
Author

sdszhang commented Sep 28, 2025

/azpw run

@sdszhang sdszhang closed this Sep 28, 2025
@sdszhang sdszhang reopened this Sep 28, 2025
@r12f
Copy link
Copy Markdown

r12f commented Sep 29, 2025

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@r12f r12f merged commit 7d3bb8c into Azure:202412 Sep 29, 2025
15 checks passed
r12f pushed a commit that referenced this pull request Oct 26, 2025
Why I did it
This is a manual cherry-pick of
sonic-net/sonic-buildimage#24105 24105
[202412] Upgrade xgs SAI version to 13.2.1.7 to include the following
fixes:

[CS00012424807]: FDB entry causing bad port state when added after
drop_counter is configured
[CS00012425264]: SRv6 uN USD decapsulation does not handle DSCP value of
inner header properly
Work item tracking
Microsoft ADO (number only): 35118084
How I did it
Update xgs SAI version in sai.mk file.

Co-authored-by: zitingguo-ms <zitingguo@microsoft.com>
bingwang-ms pushed a commit that referenced this pull request Jan 16, 2026
…tically (#24396)

#### Why I did it
src/sonic-sairedis
```
* ebdf9e97 - (HEAD -> master, origin/master, origin/HEAD) Support Sonic-VPP CRM counters for localsid. (#1673) (4 days ago) [dypet]
* 1a75149c - Fix DASH FlexCounter bulk get ENI meter class range (#1669) (10 days ago) [Mukesh Moopath Velayudhan]
* 7a116435 - Reduce severity of log for unallowed enum value (#1675) (2 weeks ago) [Connor Roos]
```
#### How I did it
#### How to verify it
#### Description for the changelog
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.

4 participants