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

[TPID CONFIG]TPID attribute Yang model and default TPID for Minigraph to configDB Changes #7630

Merged
merged 4 commits into from
May 31, 2021
Merged

[TPID CONFIG]TPID attribute Yang model and default TPID for Minigraph to configDB Changes #7630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0528696
[TPID CONFIG]TPID attribute Yang model and default TPID for Minigraph…
gechiang May 17, 2021
33295d4
Fixed alignment spacing issue, removed length and convert to use tpid…
gechiang May 28, 2021
21d1b86
Merged latest to resolve conflicts and test error due to tpid_type de…
gechiang May 29, 2021
3b9982d
One more merge conflict resolution on a very busy file
gechiang May 29, 2021
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
6 changes: 4 additions & 2 deletions src/sonic-config-engine/minigraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1450,9 +1450,10 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
# for the ports w/o neighbor info, set it to port alias
port['description'] = port.get('alias', port_name)

# set default port MTU as 9100
# set default port MTU as 9100 and default TPID 0x8100
for port in ports.values():
port['mtu'] = '9100'
port['tpid'] = '0x8100'

# asymmetric PFC is disabled by default
for port in ports.values():
Expand Down Expand Up @@ -1485,9 +1486,10 @@ def parse_xml(filename, platform=None, port_config_file=None, asic_name=None, hw
print("Warning: ignore '%s' as part of its member interfaces is not in the port_config.ini" % pc_name, file=sys.stderr)
del pcs[pc_name]

# set default port channel MTU as 9100 and admin status up
# set default port channel MTU as 9100 and admin status up and default TPID 0x8100
for pc in pcs.values():
pc['mtu'] = '9100'
pc['tpid'] = '0x8100'
pc['admin_status'] = 'up'

results['PORTCHANNEL'] = pcs
Expand Down
Loading