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

[config/acl] Get ACL config from DHCP and load it in swss container #432

Merged
merged 2 commits into from
Mar 29, 2017
Merged

[config/acl] Get ACL config from DHCP and load it in swss container #432

merged 2 commits into from
Mar 29, 2017

Conversation

taoyl-ms
Copy link
Contributor

  • In DHCP configuration, request ACL service url as a custom option
  • In update_graph service, fetch acl.json similar with minigraph.xml
  • When starting swss, set ACL according to /etc/sonic/acl.json

stcheng
stcheng reviewed Mar 24, 2017
View reviewed changes
dockers/docker-orchagent/start.sh
function config_acl {
if [ -f "/etc/sonic/acl.json" ]; then
mkdir -p /etc/swss/config.d/acl
rm -rf /etc/swss/config.d/acl/*
Copy link
Contributor

@stcheng stcheng Mar 24, 2017 •
edited by taoyl-ms
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i would prefer to have the acl configuration generation part to be there in config.sh script. we could keep the intermediate acl json files stored here. it doesn't hurt and could be used as references.

as a separate suggestion that we could do it later, i think we could just put the configurations that we need into the config.d folder, copying them from /usr/share/sonic/... folder. in sonic-swss repository, we only have samples there. #Closed

Copy link
Contributor Author

@taoyl-ms taoyl-ms Mar 24, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We currently don't have a config.sh for swss docker and I don't see much necessity to add one just for acl. We can split start.sh to config.sh and start.sh later if we added more feature and configuration logic became more complicated. #Closed

Copy link
Contributor

@stcheng stcheng Mar 24, 2017 •
edited by taoyl-ms
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agree. #Closed

lguohan
lguohan reviewed Mar 27, 2017
View reviewed changes
dockers/docker-orchagent/start.sh
rm -rf /etc/swss/config.d/acl/*
translate_acl -m /etc/sonic/minigraph.xml -o /etc/swss/config.d/acl /etc/sonic/acl.json
for filename in /etc/swss/config.d/acl/*.json; do
[ -e "$filename" ] || break
Copy link
Collaborator

@lguohan lguohan Mar 27, 2017 •
edited by taoyl-ms
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need this line? #ByDesign

Copy link
Contributor Author

@taoyl-ms taoyl-ms Mar 27, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is no file in /etc/swss/config.d/acl/, items in for loop with be executed once with filename equals to '/etc/swss/config.d/acl/*'. And it will lead to error in swssconfig. #ByDesign

files/dhcp/dhclient.conf
@@ -14,11 +14,12 @@
option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;
option snmp-community code 224 = text;
option minigraph-url code 225 = text;
option acl-url code 226 = text;
Copy link
Collaborator

@lguohan lguohan Mar 27, 2017 •
edited by taoyl-ms
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you update the doc https://github.com/Azure/SONiC/wiki/Configuration-and-Minigraph accordingly #Resolved

Copy link
Contributor Author

@taoyl-ms taoyl-ms Mar 27, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated. #Resolved

@taoyl-ms taoyl-ms merged commit 4546372 into sonic-net:master Mar 29, 2017
lguohan added a commit that referenced this pull request Mar 30, 2017
@lguohan
Revert "[config/acl] Get ACL config from DHCP and load it in swss con…
ce6e9ce 
…tainer (#432)"

This reverts commit 4546372.
lguohan added a commit that referenced this pull request Mar 30, 2017
@lguohan
Revert 432 taoyl/acl dhcp (#457)
94934f7 
* Revert "[config/acl] Get ACL config from DHCP and load it in swss container (#432)"

This reverts commit 4546372.
taoyl-ms added a commit to taoyl-ms/sonic-buildimage that referenced this pull request Apr 3, 2017
@taoyl-ms
[config/acl] Get ACL config from DHCP and load it in swss container (s…
7659e85 
…onic-net#432)

Get ACL config from DHCP and load it in swss container
@taoyl-ms taoyl-ms mentioned this pull request Apr 3, 2017
Merged
taoyl-ms added a commit that referenced this pull request Apr 3, 2017
@taoyl-ms
Re-commit PR #432 (SHA 4546372) (#474)
8c76556 
* [config/acl] Get ACL config from DHCP and load it in swss container (#432)
* Temporarily disable DHCP option 226
madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020
@andriymoroz-mlnx @yxieca
Add speed and buffer set test (sonic-net#432)
4227bee 
* Add speed and buffer set test

Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>

* Add some comments to the test

Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>
@tonytitus tonytitus mentioned this pull request Dec 29, 2020
Merged
lguohan pushed a commit that referenced this pull request Jan 1, 2021
[sonic-swss-common] Update submodule (#6317)
70ba591 
Including commits in sonic-swss-common repo:

b423b9c Add support for hexists call (#432) [Tony Titus]
0982996 Remove extension of tableNameSeparatorMap (#430) [Qi Luo]
d16cc76 [build]: add azure pipeline build badge (#429) [lguohan]
f2aaf55 Set up CI with Azure Pipelines (#428) [lguohan]
mssonicbld added a commit that referenced this pull request Feb 2, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-common to the latest HEAD…
665184e 
… automatically (#18010)

#### Why I did it
src/sonic-platform-common
```
* 538ec67 - (HEAD -> master, origin/master, origin/HEAD) Tx/Rx power values should be rounded up to 3 decimal places (#432) (6 hours ago) [mihirpat1]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Feb 2, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-common to the latest HEAD…
a467ff7 
… automatically (#18008)

#### Why I did it
src/sonic-platform-common
```
* 7c2ad66 - (HEAD -> 202311, origin/202311) Tx/Rx power values should be rounded up to 3 decimal places (#432) (4 hours ago) [mihirpat1]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Feb 5, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-common to the latest HEAD…
87a0cb4 
… automatically (#18036)

#### Why I did it
src/sonic-platform-common
```
* a64276a - (HEAD -> 202305, origin/202305) Tx/Rx power values should be rounded up to 3 decimal places (#432) (22 hours ago) [mihirpat1]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Mar 10, 2024
@mssonicbld
[submodule] Update submodule sonic-platform-daemons to the latest HEA…
68f0a15 
…D automatically (#18301)

#### Why I did it
src/sonic-platform-daemons
```
* 8a5ca2b - (HEAD -> master, origin/master, origin/HEAD) Add deterministic link bring-up feature for SFF compliant modules (#383) (2 days ago) [longhuan-cisco]
* a591c8a - [ycabled][build] Fix sonic_ycabled build failure in Bookworm (#432) (2 days ago) [Arun Saravanan Balachandran]
```
#### How I did it
#### How to verify it
#### Description for the changelog
sonic-otn pushed a commit to Weitang-Zheng/sonic-buildimage that referenced this pull request Mar 11, 2024
@mssonicbld @sonic-otn
[submodule] Update submodule sonic-platform-common to the latest HEAD…
9a3aefb 
… automatically (sonic-net#18010)

#### Why I did it
src/sonic-platform-common
```
* 538ec67 - (HEAD -> master, origin/master, origin/HEAD) Tx/Rx power values should be rounded up to 3 decimal places (sonic-net#432) (6 hours ago) [mihirpat1]
```
#### How I did it
#### How to verify it
#### Description for the changelog
sonic-otn pushed a commit to Weitang-Zheng/sonic-buildimage that referenced this pull request Mar 11, 2024
@mssonicbld @sonic-otn
[submodule] Update submodule sonic-platform-daemons to the latest HEA…
2bdf3b7 
…D automatically (sonic-net#18301)

#### Why I did it
src/sonic-platform-daemons
```
* 8a5ca2b - (HEAD -> master, origin/master, origin/HEAD) Add deterministic link bring-up feature for SFF compliant modules (sonic-net#383) (2 days ago) [longhuan-cisco]
* a591c8a - [ycabled][build] Fix sonic_ycabled build failure in Bookworm (sonic-net#432) (2 days ago) [Arun Saravanan Balachandran]
```
#### How I did it
#### How to verify it
#### Description for the changelog
saksarav-nokia pushed a commit to saksarav-nokia/sonic-buildimage that referenced this pull request Mar 12, 2024
@mssonicbld @saksarav-nokia
[submodule] Update submodule sonic-platform-common to the latest HEAD…
32cdd08 
… automatically (sonic-net#18010)

#### Why I did it
src/sonic-platform-common
```
* 538ec67 - (HEAD -> master, origin/master, origin/HEAD) Tx/Rx power values should be rounded up to 3 decimal places (sonic-net#432) (6 hours ago) [mihirpat1]
```
#### How I did it
#### How to verify it
#### Description for the changelog
saksarav-nokia pushed a commit to saksarav-nokia/sonic-buildimage that referenced this pull request Mar 12, 2024
@mssonicbld @saksarav-nokia
[submodule] Update submodule sonic-platform-daemons to the latest HEA…
74ad908 
…D automatically (sonic-net#18301)

#### Why I did it
src/sonic-platform-daemons
```
* 8a5ca2b - (HEAD -> master, origin/master, origin/HEAD) Add deterministic link bring-up feature for SFF compliant modules (sonic-net#383) (2 days ago) [longhuan-cisco]
* a591c8a - [ycabled][build] Fix sonic_ycabled build failure in Bookworm (sonic-net#432) (2 days ago) [Arun Saravanan Balachandran]
```
#### 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
Reviewers

@stcheng stcheng stcheng left review comments

@lguohan lguohan lguohan approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@taoyl-ms @lguohan @stcheng