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

Add fabric lane mapping to vs Force10-S6000 sai.profile #6185

Merged
merged 1 commit into from
Apr 7, 2021

Conversation

ngoc-do
Copy link
Contributor

@ngoc-do ngoc-do commented Dec 10, 2020

Signed-off-by: ngocdo [email protected]

- Why I did it

This PR will add fabric lane mapping for vs tests. The fabric lane mapping will be used by vslib similarly it is doing with front panel lane mapping.

The lane mapping has lane for 16 fabric ports. Each port has one lane.

This PR is part of fabric support on Sonic, together with sonic-net/sonic-swss#1459.

@ngoc-do
Copy link
Contributor Author

ngoc-do commented Jan 16, 2021

Please don't merge it yet. Let's wait until sonic-net/sonic-swss#1431 merges.

@ngoc-do
Copy link
Contributor Author

ngoc-do commented Jan 19, 2021

retest vs please

ngoc-do added a commit to ngoc-do/sonic-swss that referenced this pull request Feb 8, 2021
Now voq and fabric asics are enabled with fabric ports. Need to fix
the tests to count for fabric ports. vstest infrastructure for fabric
ports merged in sonic-net/sonic-sairedis#737 and
769. This infrastructure requires sonic-net/sonic-buildimage#6185
to be effective. However, this PR (6185) will have some swss tests
failing. We need to disable those tests, let the PR merge, and reenable
the tests.
@ngoc-do
Copy link
Contributor Author

ngoc-do commented Feb 8, 2021

retest vs please

@jleveque
Copy link
Contributor

/AzurePipelines run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

ngoc-do added a commit to ngoc-do/sonic-swss that referenced this pull request Apr 2, 2021
Now voq and fabric asics are enabled with fabric ports. Need to fix
the tests to count for fabric ports. vstest infrastructure for fabric
ports merged in sonic-net/sonic-sairedis#737 and
769. This infrastructure requires sonic-net/sonic-buildimage#6185
to be effective. However, this PR (6185) will have some swss tests
failing. We need to disable those tests, let the PR merge, and reenable
the tests.
@daall daall merged commit c2b5e93 into sonic-net:master Apr 7, 2021
@ngoc-do
Copy link
Contributor Author

ngoc-do commented Apr 7, 2021

@daall Hello Danny.

I'm not sure if you should merge this one now. Like I mentioned in one comment in sonic-net/sonic-swss#1459, if we merge this PR now, some swss tests will fail. The steps are merge sonic-net/sonic-swss#1459, and then this one, and then fix 1459 by enabling fabric port tests.

We didn't see test failures, since I think we didn't run swss tests here?

@daall
Copy link
Contributor

daall commented Apr 7, 2021

@daall Hello Danny.

I'm not sure if you should merge this one now. Like I mentioned in one comment in Azure/sonic-swss#1459, if we merge this PR now, some swss tests will fail. The steps are merge Azure/sonic-swss#1459, and then this one, and then fix 1459 by enabling fabric port tests.

We didn't see test failures, since I think we didn't run swss tests here?

Per the discussion in this PR I thought this PR only depended on 1431 and 1459 depended on this PR. If we need 1459 to merge first then I will open a revert PR for this PR.

@ngoc-do
Copy link
Contributor Author

ngoc-do commented Apr 7, 2021

@daall Hello Danny.
I'm not sure if you should merge this one now. Like I mentioned in one comment in Azure/sonic-swss#1459, if we merge this PR now, some swss tests will fail. The steps are merge Azure/sonic-swss#1459, and then this one, and then fix 1459 by enabling fabric port tests.
We didn't see test failures, since I think we didn't run swss tests here?

Per the discussion in this PR I thought this PR only depended on 1431 and 1459 depended on this PR. If we need 1459 to merge first then I will open a revert PR for this PR.

Yes, please revert it.

What happens then when we want to merge this PR. Do I need to create a new one?

@daall
Copy link
Contributor

daall commented Apr 7, 2021

@daall Hello Danny.
I'm not sure if you should merge this one now. Like I mentioned in one comment in Azure/sonic-swss#1459, if we merge this PR now, some swss tests will fail. The steps are merge Azure/sonic-swss#1459, and then this one, and then fix 1459 by enabling fabric port tests.
We didn't see test failures, since I think we didn't run swss tests here?

Per the discussion in this PR I thought this PR only depended on 1431 and 1459 depended on this PR. If we need 1459 to merge first then I will open a revert PR for this PR.

Yes, please revert it.

What happens then when we want to merge this PR. Do I need to create a new one?

Yep, just create a new PR with the same contents of this PR and then we can merge it once all the dependencies are ready! :)

@ngoc-do
Copy link
Contributor Author

ngoc-do commented Apr 7, 2021

@daall Hello Danny.
I'm not sure if you should merge this one now. Like I mentioned in one comment in Azure/sonic-swss#1459, if we merge this PR now, some swss tests will fail. The steps are merge Azure/sonic-swss#1459, and then this one, and then fix 1459 by enabling fabric port tests.
We didn't see test failures, since I think we didn't run swss tests here?

Per the discussion in this PR I thought this PR only depended on 1431 and 1459 depended on this PR. If we need 1459 to merge first then I will open a revert PR for this PR.

Yes, please revert it.
What happens then when we want to merge this PR. Do I need to create a new one?

Yep, just create a new PR with the same contents of this PR and then we can merge it once all the dependencies are ready! :)

👍 Sure thanks.

lguohan pushed a commit that referenced this pull request Apr 7, 2021
ngoc-do added a commit to ngoc-do/sonic-swss that referenced this pull request Apr 28, 2021
Now voq and fabric asics are enabled with fabric ports. Need to fix
the tests to count for fabric ports. vstest infrastructure for fabric
ports merged in sonic-net/sonic-sairedis#737 and
769. This infrastructure requires sonic-net/sonic-buildimage#6185
to be effective. However, this PR (6185) will have some swss tests
failing. We need to disable those tests, let the PR merge, and reenable
the tests.
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request May 23, 2021
raphaelt-nvidia pushed a commit to raphaelt-nvidia/sonic-buildimage that referenced this pull request May 23, 2021
jleveque pushed a commit that referenced this pull request Jun 23, 2021
…7629)

This PR is actually #6185 that was merged and then reverted to avoid test failure in swss. 

Now sonic-net/sonic-swss#1459 merged, and so this PR could merge to enable fabric test in swss.

Signed-off-by: ngocdo <[email protected]>
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
…onic-net#7629)

This PR is actually sonic-net#6185 that was merged and then reverted to avoid test failure in swss. 

Now sonic-net/sonic-swss#1459 merged, and so this PR could merge to enable fabric test in swss.

Signed-off-by: ngocdo <[email protected]>
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