[lldpmgr] add mgmt ip to lldpd conf template, handle port description/… #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…alias config Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
dockers/docker-lldp-sv2/lldpmgrd
Outdated
| else: | ||
| log_info("Unable to retrieve neighbor information for port '{}'. Not adding port description.".format(port_name)) | ||
| log_info("Unable to retrive description for port '{}'. Not adding port description") |
dockers/docker-lldp-sv2/lldpmgrd
Outdated
| @@ -221,9 +211,14 @@ class LldpManager(object): | |||
|
|
|||
| fvp_dict = dict(fvp) | |||
|
|
|||
| # handle on creation | |||
There was a problem hiding this comment.
"handle creation"?
dockers/docker-lldp-sv2/lldpmgrd
Outdated
| if op == "SET" and fvp_dict.get("state") == "ok": | ||
| self.generate_pending_lldp_config_cmd_for_port(key) | ||
|
|
||
| # handle on config change |
There was a problem hiding this comment.
"handle config..."?
mykolaf
pushed a commit
that referenced
this pull request
May 22, 2019
…c-net#2832) * Base DHCP relay Docker image on Strech base Docker * Change URL for isc-dhcp source repository * Upgrade isc-dhcp source branch to 4.3.5-3.1 * Update patch #1 to apply to isc-dhcp 4.3.5-3.1 * Update patch #2 to apply to isc-dhcp 4.3.5-3.1 * Update patch #3 to apply to isc-dhcp 4.3.5-3.1 * Update patch #4 to apply to isc-dhcp 4.3.5-3.1 * Remove security patches, as they are now applied as part of 4.3.5-3.1 source * Reorder patches to apply bug fix first, then features * Extend makefile to build debug Docker image * Update commit that series file applies against
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Mykola Faryma mykolaf@mellanox.com
- What I did
Add mgmt ip to lldpd.conf.j2
Change lldpmgrd to handle port description configured in CONFIG_DB and config the lldpd accordingly, instead of engineering some description which is never synced with DB.
- How I did it
- How to verify it
sonic-cfggen -m /etc/sonic/minigraph.xml -p /usr/share/sonic/device/x86_64-mlnx_msn2100-r0/ACS-MSN2100/port_config.ini -t lldpd.conf.j2
Result:
Config some port descriptions/alias, check lldp local port info
- Description for the changelog
Update lldpmgrd logic
- A picture of a cute animal (not mandatory but encouraged)