Skip to content

[interfaces] Use "Vlan"+tag instead of name for linux vlan device names #1016

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
Closed
wants to merge 1 commit into from
Closed

[interfaces] Use "Vlan"+tag instead of name for linux vlan device names #1016

wants to merge 1 commit into from

Conversation

taoyl-ms
Copy link
Contributor

@taoyl-ms taoyl-ms commented Oct 6, 2017

See #1003 for details.

@svc-acs
Copy link
Collaborator

svc-acs commented Oct 6, 2017

Build started sha1 is merged.

@jleveque
Copy link
Contributor

jleveque commented Oct 6, 2017 •
edited
Loading

It appears this commit will change the way we name Vlan interfaces. If so, this will also impact the DHCP relay agent.

stcheng
stcheng reviewed Oct 6, 2017
View reviewed changes
files/image_config/interfaces/interfaces.j2
@@ -62,7 +62,7 @@ iface {{ name }} {{ 'inet' if prefix | ipv4 else 'inet6' }} static
allow-hotplug {{ member }}
iface {{ member }} inet manual
pre-up ifconfig {{ member }} up mtu 9100
post-up brctl addif {{ vlan }} {{ member }} || true
post-up brctl addif Vlan{{ VLAN[vlan]['vlanid'] }} {{ member }} || true
Copy link
Contributor

Choose a reason for hiding this comment

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

how do we assign a VLAN ID if the VLAN name is not a number?

@lguohan
Copy link
Collaborator

lguohan commented Oct 6, 2017

@taoyl-ms, looks like you need to grab other places which use the 'name' to the new format.

lguohan
lguohan requested changes Oct 6, 2017
View reviewed changes
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.

seems there are other places need to be changed.

pavel-shirshov
pavel-shirshov suggested changes Oct 9, 2017
View reviewed changes
Copy link
Contributor

@pavel-shirshov pavel-shirshov left a comment •
edited by jleveque
Loading

Choose a reason for hiding this comment

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

This is not enough for this file:

# The switch front panel interfaces
{% for (name, prefix) in INTERFACE %}
allow-hotplug {{ name }}
iface {{ name }} {{ 'inet' if prefix | ipv4 else 'inet6' }} static

This should be fixed too

@lguohan
Copy link
Collaborator

lguohan commented Jan 16, 2018

@taoyl-ms , can you revive this PR?

@taoyl-ms
Copy link
Contributor Author

taoyl-ms commented Feb 3, 2018

Issue solved by a different approach in #695.

@taoyl-ms taoyl-ms closed this Feb 3, 2018
lguohan added a commit to lguohan/sonic-buildimage that referenced this pull request Aug 5, 2020
@lguohan
[submodule]: update sonic-utilities
b1f2a4e 
* 9700e45 2020-08-03 | [show/config]: combine feature and container feature cli (sonic-net#1015) (HEAD, origin/master, origin/HEAD) [lguohan]
* c9d3550 2020-08-03 | [tests]: fix drops_group_test failure on second run (sonic-net#1023) [lguohan]
* dfaae69 2020-08-03 | [lldpshow]: Fix input device is not a TTY error (sonic-net#1016) [Arun Saravanan Balachandran]
* 216688e 2020-08-02 | [tests]: rename sonic-utilitie-tests to tests (sonic-net#1022) [lguohan]
* c0c3cce 2020-07-30 | [config/config_mgmt.py]: Fix typo and enable test for tablesWithOutYang() (sonic-net#1012) [Praveen Chaudhary]
* c6c5be1 2020-07-30 | [show] Fix for 'trunk' PortChannel reported as 'routed' port (sonic-net#1002) [shlomibitton]
* ef9ac2a 2020-07-29 | importing json needed for DPB CLI (sonic-net#1010) [Sangita Maity]
* aa1b072 2020-07-23 | [config] Add Initial draft of Breakout Mode subcommand (sonic-net#766) [Sangita Maity]
lguohan added a commit that referenced this pull request Aug 5, 2020
@lguohan
[build]: combine feature and container feature table (#5081)
082c26a 
1. remove container feature table
2. do not generate feature entry if the feature is not included
   in the image
3. rename ENABLE_* to INCLUDE_* for better clarity
4. rename feature status to feature state
5. [submodule]: update sonic-utilities

* 9700e45 2020-08-03 | [show/config]: combine feature and container feature cli (#1015) (HEAD, origin/master, origin/HEAD) [lguohan]
* c9d3550 2020-08-03 | [tests]: fix drops_group_test failure on second run (#1023) [lguohan]
* dfaae69 2020-08-03 | [lldpshow]: Fix input device is not a TTY error (#1016) [Arun Saravanan Balachandran]
* 216688e 2020-08-02 | [tests]: rename sonic-utilitie-tests to tests (#1022) [lguohan]

Signed-off-by: Guohan Lu <[email protected]>
abdosi pushed a commit that referenced this pull request Aug 9, 2020
@lguohan @abdosi
[build]: combine feature and container feature table (#5081)
78c8038 
1. remove container feature table
2. do not generate feature entry if the feature is not included
   in the image
3. rename ENABLE_* to INCLUDE_* for better clarity
4. rename feature status to feature state
5. [submodule]: update sonic-utilities

* 9700e45 2020-08-03 | [show/config]: combine feature and container feature cli (#1015) (HEAD, origin/master, origin/HEAD) [lguohan]
* c9d3550 2020-08-03 | [tests]: fix drops_group_test failure on second run (#1023) [lguohan]
* dfaae69 2020-08-03 | [lldpshow]: Fix input device is not a TTY error (#1016) [Arun Saravanan Balachandran]
* 216688e 2020-08-02 | [tests]: rename sonic-utilitie-tests to tests (#1022) [lguohan]

Signed-off-by: Guohan Lu <[email protected]>
santhosh-kt pushed a commit to santhosh-kt/sonic-buildimage that referenced this pull request Feb 25, 2021
@lguohan @santhosh-kt
[build]: combine feature and container feature table (sonic-net#5081)
70732f3 
1. remove container feature table
2. do not generate feature entry if the feature is not included
   in the image
3. rename ENABLE_* to INCLUDE_* for better clarity
4. rename feature status to feature state
5. [submodule]: update sonic-utilities

* 9700e45 2020-08-03 | [show/config]: combine feature and container feature cli (sonic-net#1015) (HEAD, origin/master, origin/HEAD) [lguohan]
* c9d3550 2020-08-03 | [tests]: fix drops_group_test failure on second run (sonic-net#1023) [lguohan]
* dfaae69 2020-08-03 | [lldpshow]: Fix input device is not a TTY error (sonic-net#1016) [Arun Saravanan Balachandran]
* 216688e 2020-08-02 | [tests]: rename sonic-utilitie-tests to tests (sonic-net#1022) [lguohan]

Signed-off-by: Guohan Lu <[email protected]>
stepanblyschak pushed a commit to stepanblyschak/sonic-buildimage that referenced this pull request May 10, 2021
@ArunSaravananBalachandran
[lldpshow]: Fix input device is not a TTY error (sonic-net#1016)
dfaae69 
Fix Azure/sonic-buildimage#5019

Fix "the input device is not a TTY" error reported by 'show lldp' commands when executed via pytest scripts in sonic-mgmt.
lguohan pushed a commit that referenced this pull request Jun 4, 2022
@bingwang-ms
[sonic-sairedis]: update submodule sonic-sairedis (#10982)
eda95b8 
544e4c2 (origin/202012) [ci] Paralize azure pipeline (#1044)
45b310d Enable SAI_SWITCH_ATTR_UNINIT_DATA_PLANE_ON_REMOVAL attribute (#1016)
9e56674 Advance submodule SAI for 202012 branch (#1032)

Signed-off-by: bingwang <[email protected]>
DavidZagury pushed a commit to DavidZagury/sonic-buildimage that referenced this pull request Apr 28, 2025
@mssonicbld
[submodule][202412] Update submodule sonic-sairedis to the latest HEA…
2ac85d7 
…D automatically (sonic-net#1016)

#### Why I did it
src/sonic-sairedis
```
* 86d1413 - (HEAD -> 202412, origin/HEAD, origin/202412) Merge pull request #45 from r12f/code-sync-202412 (31 minutes ago) [Riff]
* 0fcc968 - Merge remote-tracking branch 'base/202411' into code-sync-202412 (13 hours ago) [r12f]
* 4048483 - Revert "Optimize counter polling interval by making it more accurate (sonic-net#1457) …" (sonic-net#1570) (2 weeks ago) [Kumaresh Perumal]
* 420d92f - Update build_and_install_module.sh to match newer Linux kernel version (sonic-net#1561) (4 weeks ago) [mssonicbld]
* e2d2ca6 - [vslib] SAI_KEY_VS_OPER_SPEED_IS_CONFIGURED_SPEED, SAI_PORT_ATTR_HOST_TX_READY_STATUS support (sonic-net#1553) (5 weeks ago) [mssonicbld]
* 8c17d4b - Revert "Do not enter vendor SAI critical section for counter polling/clearing operations (sonic-net#1450)" (sonic-net#1541) (7 weeks ago) [mssonicbld]
* 3df03e1 - Optimize counter polling interval by making it more accurate (sonic-net#1457) (sonic-net#1534) (7 weeks ago) [Stephen Sun]
* d884ff9 - [syncd] Move logSet logGet under mutex to prevent race condition (sonic-net#1520) (sonic-net#1538) (8 weeks ago) [Kamil Cudnik]
* ec8b3c3 - Fix pipeline errors related to rsyslogd and libswsscommon installation (sonic-net#1535) (8 weeks ago) [mssonicbld]
* 6b263b8 - [FC] Support Policer Counter (sonic-net#1533) (8 weeks ago) [mssonicbld]
* e53489e - [syncd] Update log level for bulk api (sonic-net#1532) (8 weeks ago) [Jianyue Wu]
* 7ae00e5 - Define bulk chunk size and bulk chunk size per counter ID (sonic-net#1528) (9 weeks ago) [mssonicbld]
* f35e743 - [nvidia] Skip SAI discovery on ports (sonic-net#1524) (2 months ago) [mssonicbld]
* bf049ed - Use sonictest pool instead of sonic-common and fix arm64 issue. (sonic-net#1516) (2 months ago) [mssonicbld]
* ffe371d - [syncd] Support bulk set in INIT_VIEW mode (sonic-net#1517) (2 months ago) [mssonicbld]
```
#### 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 requested changes

@pavel-shirshov pavel-shirshov pavel-shirshov requested changes

Assignees
No one assigned
Labels
Bug 🐛 Enhancement ➕
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@taoyl-ms @svc-acs @jleveque @lguohan @stcheng @pavel-shirshov