Skip to content

[swss]: Fix ports.json.j2 file and minigraph.py to exclude ports without speed #1229

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

Closed
stcheng wants to merge 1 commit into from
Closed

[swss]: Fix ports.json.j2 file and minigraph.py to exclude ports without speed #1229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions dockers/docker-orchagent/ports.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[
{% if PORT %}
{% for port in PORT %}
{% if PORT[port].has_key('speed') %}
{
"PORT_TABLE:{{ port }}": {
"speed": "{{ PORT[port]['speed'] }}",
Expand All @@ -10,7 +9,6 @@
"OP": "SET"
}{% if not loop.last %},{% endif %}

{% endif %}
{% endfor %}
{% endif %}
]
3 changes: 3 additions & 0 deletions src/sonic-config-engine/minigraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,10 +398,13 @@ def parse_xml(filename, platform=None, port_config_file=None):
results['VLAN_INTERFACE'] = vlan_intfs
results['PORTCHANNEL_INTERFACE'] = pc_intfs

# TODO: the speed (if exits) in port_config.ini shall align with the speed in minigraph
for port_name in port_speeds:
ports.setdefault(port_name, {})['speed'] = port_speeds[port_name]
for port_name in port_descriptions:
ports.setdefault(port_name, {})['description'] = port_descriptions[port_name]
# if the speed is not defined, the port shall be removed from the ports list
ports = { key: value for key, value in ports.iteritems() if 'speed' in value.keys() }

results['PORT'] = ports
results['PORTCHANNEL'] = pcs
Expand Down