-
Notifications
You must be signed in to change notification settings - Fork 287
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
Merge vector packet processing (vpp) from sonic-platform-vpp with virtual switch #1473
Open
kcudnik
wants to merge
22
commits into
sonic-net:master
Choose a base branch
from
kcudnik:vppint
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
ea90c34
Make vpp as SwitchVpp class
kcudnik 705a0ae
Update VPP_LIBS variable
kcudnik 771d305
Update configure.ac
kcudnik 34895e5
Move unchecked vpp code to vpp directory
kcudnik a9767a4
Fix makefile
kcudnik fdaa992
Fix swss enter
kcudnik aa04ead
remove unnecessary paths
kcudnik 14fc320
Update Makefile to skip vpp if not available
kcudnik 97d3477
Merge branch 'master' into vppint
kcudnik d8a7858
add more excluded warnings to compile vpp
kcudnik 6cd1142
Fix warn messages
kcudnik c60c941
Add vpp in swss docker
kcudnik d4fea11
install libnl first in swss docker
kcudnik fa0084d
try without libteam swss
kcudnik a968337
add libnl-cli to swss docker
kcudnik 8cd688d
try pririlaged
kcudnik 2af4459
build docker swss with vpp
kcudnik a6e24d0
install vpp deb explicitly
kcudnik 1a3e757
update libc6
kcudnik 583e3db
update libc6
kcudnik e1e7619
Merge branch 'master' into vppint
kcudnik 3c35cf6
Add functions from SwitchBCM
kcudnik File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,6 +49,7 @@ jobs: | |
|
||
container: | ||
image: sonicdev-microsoft.azurecr.io:443/${{ parameters.sonic_slave }}:latest | ||
options: "--privileged" | ||
|
||
steps: | ||
- checkout: sonic-swss | ||
|
@@ -60,6 +61,32 @@ jobs: | |
git submodule update | ||
git status | ||
displayName: Set up sonic-swss branch | ||
- task: DownloadPipelineArtifact@2 | ||
inputs: | ||
source: specific | ||
project: build | ||
pipeline: Azure.sonic-buildimage.common_libs | ||
runVersion: 'latestFromBranch' | ||
runBranch: 'refs/heads/$(BUILD_BRANCH)' | ||
path: $(Build.ArtifactStagingDirectory)/download | ||
artifact: common-lib | ||
patterns: | | ||
target/debs/${{ parameters.debian_version }}/libnl-cli*.deb | ||
target/debs/${{ parameters.debian_version }}/libnl-3*.deb | ||
target/debs/${{ parameters.debian_version }}/libnl-genl*.deb | ||
target/debs/${{ parameters.debian_version }}/libnl-route*.deb | ||
target/debs/${{ parameters.debian_version }}/libnl-nf*.deb | ||
target/debs/${{ parameters.debian_version }}/libyang_*.deb | ||
target/debs/${{ parameters.debian_version }}/libprotobuf*.deb | ||
target/debs/${{ parameters.debian_version }}/libprotoc*.deb | ||
target/debs/${{ parameters.debian_version }}/protobuf-compiler*.deb | ||
displayName: "Download libnl libs" | ||
- script: | | ||
set -ex | ||
sudo dpkg -i $(find ./download -name libnl-*_${{ parameters.arch }}.deb) | ||
condition: eq('${{ parameters.arch }}', 'amd64') | ||
workingDirectory: $(Build.ArtifactStagingDirectory) | ||
displayName: "Install sonic libnl" | ||
- script: | | ||
set -ex | ||
sudo apt-get update | ||
|
@@ -68,7 +95,6 @@ jobs: | |
libzmq3-dev \ | ||
swig4.0 \ | ||
libdbus-1-dev \ | ||
libteam-dev \ | ||
rsyslog | ||
|
||
sudo perl -i.bk -ne 'print if not /SONiCFileFormat|ActionFileDefaultTemplate/' /etc/rsyslog.conf | ||
|
@@ -104,25 +130,6 @@ jobs: | |
libsaimetadata-dev_*.deb | ||
syncd-vs_*.deb | ||
displayName: "Download pre-stage built ${{ parameters.sairedis_artifact_name }}" | ||
- task: DownloadPipelineArtifact@2 | ||
inputs: | ||
source: specific | ||
project: build | ||
pipeline: Azure.sonic-buildimage.common_libs | ||
runVersion: 'latestFromBranch' | ||
runBranch: 'refs/heads/$(BUILD_BRANCH)' | ||
path: $(Build.ArtifactStagingDirectory)/download | ||
artifact: common-lib | ||
patterns: | | ||
target/debs/${{ parameters.debian_version }}/libnl-3*.deb | ||
target/debs/${{ parameters.debian_version }}/libnl-genl*.deb | ||
target/debs/${{ parameters.debian_version }}/libnl-route*.deb | ||
target/debs/${{ parameters.debian_version }}/libnl-nf*.deb | ||
target/debs/${{ parameters.debian_version }}/libyang_*.deb | ||
target/debs/${{ parameters.debian_version }}/libprotobuf*.deb | ||
target/debs/${{ parameters.debian_version }}/libprotoc*.deb | ||
target/debs/${{ parameters.debian_version }}/protobuf-compiler*.deb | ||
displayName: "Download common libs" | ||
- task: DownloadPipelineArtifact@2 | ||
inputs: | ||
source: specific | ||
|
@@ -138,6 +145,33 @@ jobs: | |
patterns: | | ||
libdashapi*.deb | ||
displayName: "Download dash api test" | ||
- task: DownloadPipelineArtifact@2 | ||
inputs: | ||
source: specific | ||
project: build | ||
pipeline: sonic-net.sonic-platform-vpp | ||
artifact: vpp | ||
runVersion: 'latestFromBranch' | ||
runBranch: 'refs/heads/main' | ||
allowPartiallySucceededBuilds: true | ||
path: $(Build.ArtifactStagingDirectory)/download | ||
displayName: "Download sonic platform-vpp deb packages" | ||
condition: eq('${{ parameters.arch }}', 'amd64') | ||
- script: | | ||
set -ex | ||
sudo dpkg -i download/libvppinfra-dev_*_${{ parameters.arch }}.deb | ||
sudo dpkg -i download/libvppinfra_*_${{ parameters.arch }}.deb | ||
sudo dpkg -i download/vpp_*_${{ parameters.arch }}.deb | ||
sudo dpkg -i download/vpp-crypto-engines_*_${{ parameters.arch }}.deb | ||
sudo dpkg -i download/vpp-dbg_*_${{ parameters.arch }}.deb | ||
sudo dpkg -i download/vpp-dev_*_${{ parameters.arch }}.deb | ||
sudo dpkg -i download/vpp-plugin-core_*_${{ parameters.arch }}.deb | ||
sudo dpkg -i download/vpp-plugin-devtools_*_${{ parameters.arch }}.deb | ||
sudo dpkg -i download/vpp-plugin-dpdk_*_${{ parameters.arch }}.deb | ||
sudo dpkg -i download/python3-vpp-api_*_${{ parameters.arch }}.deb | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. suggestion is to add these dependency here. https://github.com/sonic-net/sonic-buildimage/tree/master/platform/vs/docker-sonic-vs |
||
workingDirectory: $(Build.ArtifactStagingDirectory) | ||
displayName: "Install sonic platform-vpp packages" | ||
condition: eq('${{ parameters.arch }}', 'amd64') | ||
- script: | | ||
set -ex | ||
# install libyang before install libswsscommon | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should not touch the template here. we should modify the https://github.com/sonic-net/sonic-buildimage/tree/master/platform/vs/docker-sonic-vs to include vpp in docker-sonic-vs doker.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how then this sairedis repo will pull that image ?