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

[dashrouteorch]: Rename dash route namespace #2966

Merged
merged 7 commits into from
Dec 4, 2023
Merged

[dashrouteorch]: Rename dash route namespace #2966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d74652b
Rename dash route namespace
Pterosaur Nov 22, 2023
143a643
Merge branch 'master' into update_dash_api
Pterosaur Nov 29, 2023
ce1e4ce
Update azp
Pterosaur Dec 1, 2023
5a8b7db
Merge branch 'master' into update_dash_api
Pterosaur Dec 1, 2023
b5aecf1
Update azp
Pterosaur Dec 2, 2023
c8e5423
Polish azp
Pterosaur Dec 2, 2023
da40a6e
Merge branch 'master' into update_dash_api
Pterosaur Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .azure-pipelines/build-docker-sonic-vs-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,21 @@ jobs:
${{ parameters.sairedis_artifact_pattern }}/libsaimetadata-dev_*.deb
${{ parameters.sairedis_artifact_pattern }}/syncd-vs_*.deb
displayName: "Download sonic sairedis deb packages"
- task: DownloadPipelineArtifact@2
inputs:
source: specific
project: build
pipeline: sonic-net.sonic-dash-api
${{ if eq(parameters.arch, 'amd64') }}:
artifact: sonic-dash-api
${{ else }}:
artifact: sonic-dash-api.${{ parameters.arch }}
runVersion: 'latestFromBranch'
runBranch: 'refs/heads/$(BUILD_BRANCH)'
path: $(Build.ArtifactStagingDirectory)/download
patterns: |
libdashapi*.deb
displayName: "Download dash api"
- task: DownloadPipelineArtifact@2
inputs:
artifact: ${{ parameters.swss_artifact_name }}
Expand Down
16 changes: 15 additions & 1 deletion .azure-pipelines/build-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,22 @@ jobs:
target/debs/bullseye/libprotobuf*.deb
target/debs/bullseye/libprotoc*.deb
target/debs/bullseye/protobuf-compiler*.deb
target/debs/bullseye/libdashapi*.deb
displayName: "Download common libs"
- task: DownloadPipelineArtifact@2
inputs:
source: specific
project: build
pipeline: sonic-net.sonic-dash-api
${{ if eq(parameters.arch, 'amd64') }}:
artifact: sonic-dash-api
${{ else }}:
artifact: sonic-dash-api.${{ parameters.arch }}
runVersion: 'latestFromBranch'
runBranch: 'refs/heads/$(BUILD_BRANCH)'
path: $(Build.ArtifactStagingDirectory)/download/common
patterns: |
libdashapi*.deb
displayName: "Download dash api"
- script: |
set -ex
cd download
Expand Down
5 changes: 3 additions & 2 deletions .azure-pipelines/docker-sonic-vs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ COPY ["debs", "/debs"]
# Remove existing packages first before installing the new/current packages. This is to overcome limitations with
# Docker's diff detection mechanism, where only the file size and the modification timestamp (which will remain the
# same, even though contents have changed) are checked between the previous and current layer.
RUN dpkg --purge libswsscommon python3-swsscommon sonic-db-cli libsaimetadata libsairedis libsaivs syncd-vs swss sonic-eventd
RUN dpkg --purge libswsscommon python3-swsscommon sonic-db-cli libsaimetadata libsairedis libsaivs syncd-vs swss sonic-eventd libdashapi

RUN dpkg -i /debs/libswsscommon_1.0.0_amd64.deb \
RUN dpkg -i /debs/libdashapi_1.0.0_amd64.deb \
/debs/libswsscommon_1.0.0_amd64.deb \
/debs/python3-swsscommon_1.0.0_amd64.deb \
/debs/sonic-db-cli_1.0.0_amd64.deb \
/debs/libsaimetadata_1.0.0_amd64.deb \
Expand Down
4 changes: 2 additions & 2 deletions orchagent/dash/dashrouteorch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ struct OutboundRoutingEntry
{
sai_object_id_t eni;
swss::IpPrefix destination;
dash::route_lpm::Route metadata;
dash::route::Route metadata;
};

struct InboundRoutingEntry
Expand All @@ -43,7 +43,7 @@ struct OutboundRoutingBulkContext
{
std::string eni;
swss::IpPrefix destination;
dash::route_lpm::Route metadata;
dash::route::Route metadata;
std::deque<sai_status_t> object_statuses;
OutboundRoutingBulkContext() {}
OutboundRoutingBulkContext(const OutboundRoutingBulkContext&) = delete;
Expand Down
Loading