Skip to content

Commit fd85208

Browse files
authored
[dashrouteorch]: Rename dash route namespace (sonic-net#2966)
* [Dash] Rename dash route namespace
1 parent d839eec commit fd85208

File tree

4 files changed

+35
-5
lines changed

4 files changed

+35
-5
lines changed

.azure-pipelines/build-docker-sonic-vs-template.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,21 @@ jobs:
100100
${{ parameters.sairedis_artifact_pattern }}/libsaimetadata-dev_*.deb
101101
${{ parameters.sairedis_artifact_pattern }}/syncd-vs_*.deb
102102
displayName: "Download sonic sairedis deb packages"
103+
- task: DownloadPipelineArtifact@2
104+
inputs:
105+
source: specific
106+
project: build
107+
pipeline: sonic-net.sonic-dash-api
108+
${{ if eq(parameters.arch, 'amd64') }}:
109+
artifact: sonic-dash-api
110+
${{ else }}:
111+
artifact: sonic-dash-api.${{ parameters.arch }}
112+
runVersion: 'latestFromBranch'
113+
runBranch: 'refs/heads/$(BUILD_BRANCH)'
114+
path: $(Build.ArtifactStagingDirectory)/download
115+
patterns: |
116+
libdashapi*.deb
117+
displayName: "Download dash api"
103118
- task: DownloadPipelineArtifact@2
104119
inputs:
105120
artifact: ${{ parameters.swss_artifact_name }}

.azure-pipelines/build-template.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,22 @@ jobs:
159159
target/debs/bullseye/libprotobuf*.deb
160160
target/debs/bullseye/libprotoc*.deb
161161
target/debs/bullseye/protobuf-compiler*.deb
162-
target/debs/bullseye/libdashapi*.deb
163162
displayName: "Download common libs"
163+
- task: DownloadPipelineArtifact@2
164+
inputs:
165+
source: specific
166+
project: build
167+
pipeline: sonic-net.sonic-dash-api
168+
${{ if eq(parameters.arch, 'amd64') }}:
169+
artifact: sonic-dash-api
170+
${{ else }}:
171+
artifact: sonic-dash-api.${{ parameters.arch }}
172+
runVersion: 'latestFromBranch'
173+
runBranch: 'refs/heads/$(BUILD_BRANCH)'
174+
path: $(Build.ArtifactStagingDirectory)/download/common
175+
patterns: |
176+
libdashapi*.deb
177+
displayName: "Download dash api"
164178
- script: |
165179
set -ex
166180
cd download

.azure-pipelines/docker-sonic-vs/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ COPY ["debs", "/debs"]
88
# Remove existing packages first before installing the new/current packages. This is to overcome limitations with
99
# Docker's diff detection mechanism, where only the file size and the modification timestamp (which will remain the
1010
# same, even though contents have changed) are checked between the previous and current layer.
11-
RUN dpkg --purge libswsscommon python3-swsscommon sonic-db-cli libsaimetadata libsairedis libsaivs syncd-vs swss sonic-eventd
11+
RUN dpkg --purge libswsscommon python3-swsscommon sonic-db-cli libsaimetadata libsairedis libsaivs syncd-vs swss sonic-eventd libdashapi
1212

13-
RUN dpkg -i /debs/libswsscommon_1.0.0_amd64.deb \
13+
RUN dpkg -i /debs/libdashapi_1.0.0_amd64.deb \
14+
/debs/libswsscommon_1.0.0_amd64.deb \
1415
/debs/python3-swsscommon_1.0.0_amd64.deb \
1516
/debs/sonic-db-cli_1.0.0_amd64.deb \
1617
/debs/libsaimetadata_1.0.0_amd64.deb \

orchagent/dash/dashrouteorch.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ struct OutboundRoutingEntry
2424
{
2525
sai_object_id_t eni;
2626
swss::IpPrefix destination;
27-
dash::route_lpm::Route metadata;
27+
dash::route::Route metadata;
2828
};
2929

3030
struct InboundRoutingEntry
@@ -43,7 +43,7 @@ struct OutboundRoutingBulkContext
4343
{
4444
std::string eni;
4545
swss::IpPrefix destination;
46-
dash::route_lpm::Route metadata;
46+
dash::route::Route metadata;
4747
std::deque<sai_status_t> object_statuses;
4848
OutboundRoutingBulkContext() {}
4949
OutboundRoutingBulkContext(const OutboundRoutingBulkContext&) = delete;

0 commit comments

Comments
 (0)