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

[lldp] For MGMT port, if port alias is available, use it for Port ID subtype; otherwise use port name #2445

Merged
merged 1 commit into from
Jan 15, 2019
Merged

[lldp] For MGMT port, if port alias is available, use it for Port ID subtype; otherwise use port name #2445

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
8 changes: 7 additions & 1 deletion dockers/docker-lldp-sv2/lldpd.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
{% if MGMT_INTERFACE %}
configure ports eth0 lldp portidsubtype local {{ MGMT_INTERFACE.keys()[0][0] }}
{# If MGMT port alias is available, use it for port ID subtype, otherwise use port name #}
Copy link
Collaborator

Choose a reason for hiding this comment

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

should we do this in lldpmgrd or in this template?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We could move MGMT port configuration into lldpmgrd to consolidate the configuration logic. I just updated the existing template here to make this a quick and minor change.

{% set mgmt_port_name = MGMT_INTERFACE.keys()[0][0] %}
{% if MGMT_PORT and MGMT_PORT[mgmt_port_name] and MGMT_PORT[mgmt_port_name].alias %}
configure ports eth0 lldp portidsubtype local {{ MGMT_PORT[mgmt_port_name].alias }}
{% else %}
configure ports eth0 lldp portidsubtype local {{ mgmt_port_name }}
{% endif %}
{% endif %}