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 support for vlanconfd and intfconfd #1063

Merged
merged 5 commits into from
Nov 6, 2017
Merged

Add support for vlanconfd and intfconfd #1063

merged 5 commits into from
Nov 6, 2017

Conversation

jipanyang
Copy link
Collaborator

Signed-off-by: Jipan Yang jipan.yang@alibaba-inc.com

- What I did
VLAN trunk support.

- How I did it

- How to verify it
VLAN trunk test plan: https://github.com/Azure/SONiC/wiki/VLAN-trunk-test-plan
- Description for the changelog

@jipanyang
Copy link
Collaborator Author

jipanyang commented Oct 21, 2017

@jipanyang
Copy link
Collaborator Author

jipanyang commented Oct 21, 2017

image

@lguohan
Copy link
Collaborator

lguohan commented Nov 3, 2017

please resolve conflict.

@@ -0,0 +1,2 @@
#!/bin/bash
docker exec -i swss cfgmgr "$@"
Copy link
Collaborator

Choose a reason for hiding this comment

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

it is better to incorporate this into the show/config commands in sonic utilities. I suggest to remove this in this PR and only include vlanmgrd and intfmgrd.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

removed.

@@ -16,3 +16,4 @@ $(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_ORCHAGENT_BRCM)_RUN_OPT += -v /var/log/swss:/var/log/swss:rw

$(DOCKER_ORCHAGENT_BRCM)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel
$(DOCKER_ORCHAGENT_BRCM)_BASE_IMAGE_FILES += cfgmgr:/usr/bin/cfgmgr
Copy link
Collaborator

Choose a reason for hiding this comment

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

remove

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

done.

@@ -16,3 +16,4 @@ $(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
$(DOCKER_ORCHAGENT_CAVM)_RUN_OPT += -v /var/log/swss:/var/log/swss:rw

$(DOCKER_ORCHAGENT_CAVM)_BASE_IMAGE_FILES += swssloglevel:/usr/bin/swssloglevel
$(DOCKER_ORCHAGENT_BRCM)_BASE_IMAGE_FILES += cfgmgr:/usr/bin/cfgmgr
Copy link
Collaborator

Choose a reason for hiding this comment

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

remove

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

done.

Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
@lguohan
Copy link
Collaborator

lguohan commented Nov 5, 2017

can you also update the submodule in this PR?

Copy link
Collaborator

@lguohan lguohan left a comment

Choose a reason for hiding this comment

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

can you update the swss submodule in this PR?

Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
@jipanyang
Copy link
Collaborator Author

Updated with swss and swss-common submodules.

@lguohan lguohan merged commit 7406d37 into sonic-net:master Nov 6, 2017
@lguohan lguohan mentioned this pull request Jun 11, 2022
6 tasks
lguohan added a commit to lguohan/sonic-buildimage that referenced this pull request Jun 14, 2022
* 48cccb4 2022-06-13 | do not use sai_query_api_version if vendor sai does not support in VendorSai.cpp (sonic-net#1064) (HEAD, origin/master, origin/HEAD) [Guohan Lu]
* 9b0f773 2022-06-13 | [vslib]: Fixbug in cleanup MACsec device (sonic-net#1059) [Ze Gan]
* cdf9427 2022-06-11 | No sai api version check if vendor sai does not support (sonic-net#1063) (HEAD, origin/master, origin/HEAD) [Guohan Lu]
* 3964cf1 2022-06-09 | [counter] Fix port flex counter  (sonic-net#1052) [Junhua Zhai]
* 2231b7a 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#1057) [Qi Luo]
* 7aa09b9 2022-06-01 | Set PR diff code coverage threshold to 80% (sonic-net#1039) [Kamil Cudnik]
* 66a29bc 2022-05-18 | [syncd] Use vendor SAI instead of direct SAI api (sonic-net#1042) [Kamil Cudnik]
* 564bea7 2022-05-18 | [ci] Paralize azure pipeline (sonic-net#1040) [Shilong Liu]
* 57ed180 2022-05-17 | [configure.ac] implement SAI API version check (sonic-net#1000) [Stepan Blyshchak]
* 8894dc7 2022-05-17 | vslib: add support for read-only port capabilities (sonic-net#1038) [Dante (Kuo-Jung) Su]
* 42af975 2022-04-29 | [vslib]: Update packet number of MACsec SA at runtime (sonic-net#1007) [Ze Gan]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
Pterosaur added a commit to Pterosaur/sonic-buildimage that referenced this pull request Jun 14, 2022
b13d7d2 [debian/rules] Fail on script error during package build (sonic-net#1050)
48cccb4 do not use sai_query_api_version if vendor sai does not support in VendorSai.cpp (sonic-net#1064)
9b0f773 [vslib]: Fixbug in cleanup MACsec device (sonic-net#1059)
cdf9427 No sai api version check if vendor sai does not support (sonic-net#1063)
3964cf1 [counter] Fix port flex counter  (sonic-net#1052)
2231b7a Purge package sonic-db-cli which depends on libswsscommon (sonic-net#1057)
7aa09b9 Set PR diff code coverage threshold to 80% (sonic-net#1039)
66a29bc [syncd] Use vendor SAI instead of direct SAI api (sonic-net#1042)
564bea7 [ci] Paralize azure pipeline (sonic-net#1040)
57ed180 [configure.ac] implement SAI API version check (sonic-net#1000)
8894dc7 vslib: add support for read-only port capabilities (sonic-net#1038)
42af975 [vslib]: Update packet number of MACsec SA at runtime (sonic-net#1007)

Signed-off-by: Ze Gan <ganze718@gmail.com>
lguohan added a commit that referenced this pull request Jun 14, 2022
* 48cccb4 2022-06-13 | do not use sai_query_api_version if vendor sai does not support in VendorSai.cpp (#1064) (HEAD, origin/master, origin/HEAD) [Guohan Lu]
* 9b0f773 2022-06-13 | [vslib]: Fixbug in cleanup MACsec device (#1059) [Ze Gan]
* cdf9427 2022-06-11 | No sai api version check if vendor sai does not support (#1063) (HEAD, origin/master, origin/HEAD) [Guohan Lu]
* 3964cf1 2022-06-09 | [counter] Fix port flex counter  (#1052) [Junhua Zhai]
* 2231b7a 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (#1057) [Qi Luo]
* 7aa09b9 2022-06-01 | Set PR diff code coverage threshold to 80% (#1039) [Kamil Cudnik]
* 66a29bc 2022-05-18 | [syncd] Use vendor SAI instead of direct SAI api (#1042) [Kamil Cudnik]
* 564bea7 2022-05-18 | [ci] Paralize azure pipeline (#1040) [Shilong Liu]
* 57ed180 2022-05-17 | [configure.ac] implement SAI API version check (#1000) [Stepan Blyshchak]
* 8894dc7 2022-05-17 | vslib: add support for read-only port capabilities (#1038) [Dante (Kuo-Jung) Su]
* 42af975 2022-04-29 | [vslib]: Update packet number of MACsec SA at runtime (#1007) [Ze Gan]

Signed-off-by: Guohan Lu <lguohan@gmail.com>
taras-keryk pushed a commit to taras-keryk/sonic-buildimage that referenced this pull request Jul 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants