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.

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

[lldpmgr] add mgmt ip to lldpd conf template, handle port description/alias changes #2396

Merged
merged 6 commits into from
Jan 30, 2019

Conversation

mykolaf
Copy link
Collaborator

@mykolaf mykolaf commented Dec 21, 2018

Signed-off-by: Mykola Faryma [email protected]

- 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

  • remove the description generating logic
  • add logic to listen to CONFIG_DB PORT table canges

- 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:

configure ports eth0 lldp portidsubtype local eth0
configure system ip management pattern 10.210.10.21

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)

else:
log_info("Unable to retrieve neighbor information for port '{}'. Not adding port description.".format(port_name))
log_info("Unable to retrieve description for port '{}'. Not adding port description")
Copy link
Contributor

Choose a reason for hiding this comment

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

Why remove the string formatting argument? Now there is a formating specifier without a matching argument.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Hi @jleveque , can you approve?

@liat-grozovik
Copy link
Collaborator

@jleveque your comments were addressed. can you please review and approve?

@liat-grozovik liat-grozovik merged commit 52c533f into sonic-net:master Jan 30, 2019
@yxieca
Copy link
Contributor

yxieca commented Feb 14, 2019

Made to 201811 branch on 2/14/2019

yxieca pushed a commit that referenced this pull request Feb 14, 2019
…/alias changes (#2396)

* [lldpmgr] add mgmt ip to lldpd conf templte, handle port description/alias config

Signed-off-by: Mykola Faryma <[email protected]>

* fix typo

* [config-engine] update test sample output lldpd.conf

Signed-off-by: Mykola Faryma <[email protected]>

* fix the log message

* fix lldpd.conf.j2
@mykolaf mykolaf deleted the lldpmgr branch March 3, 2020 16:11
stephenxs added a commit to stephenxs/sonic-buildimage that referenced this pull request Aug 9, 2022
dc8bc1c [portsorch] Expose supported FEC modes to STABE_DB and check whether FEC mode is supported before setting it (sonic-net#2333)
6565b50 Revert "[portsorch] Expose supported FEC modes to STABE_DB and check whether FEC mode is supported before setting it (sonic-net#2333)" (sonic-net#2396)
dc88d55 Revert hwinfo count change (sonic-net#2383)
75fc965 [DualToR] Handle race condition between tunnel_decap and mux orchestrator (sonic-net#2397)
525a57f Fix for remote system interface not getting created (sonic-net#2364)
3161eaa portsorch: initial support for link-training (sonic-net#2359)
dc477fb [swss/cfgmgr] teammgr configure lacp rate (sonic-net#2121)
2489ad5 Improve pytest speend by grouping 20 tests together. (sonic-net#2390)
168bd3b [EVPN]Modified tunnel creation logic when creating tunnel in VRF-VNI map creation flow (sonic-net#2404)
1e1438e [portsorch] Expose supported FEC modes to STABE_DB and check whether FEC mode is supported before setting it (sonic-net#2400)
9f2e27b [QoS] Fix issue: the WRED profile can not be set if current min > new max or current max < new min (sonic-net#2379)
d36c17d [asan][aclorch] fix a memory leak in the SaiAttrWrapper::swap() (sonic-net#2382)

Signed-off-by: Stephen Sun <[email protected]>
prgeor pushed a commit that referenced this pull request Aug 10, 2022
* Advance sonic-utilities pointer

7919077f Add FEC correctable and uncorrectable port stats (#2027)
ecb91367 Add CLI to configure YANG config validation (#2147)
e9ab5235 Add override testcase to verify removal (#2288)
c6794b55 Fix version in db_migrator  for `PORT_QOS_MAP|global` (#2289)
92b889b7 [intfutil] Check whether the FEC mode is supported on the platform before configuring it to CONFIG_DB (#2223)
dab0d065 Transfer organization from Azure to sonic-net (#2284)
6de18a1d [watermarkstat] Fix CLI script for unconfigured PG counters (#2239)
ac2f5530 Improve the way to check port type of RJ45 port (#2249)
142185c9 Fix the issue that sonic_platform is not installed on vs image (#2300)
ca14133f [crm] add checking for CRM interval range (#2293)

Signed-off-by: Stephen Sun <[email protected]>

* Advance swss

dc8bc1c [portsorch] Expose supported FEC modes to STABE_DB and check whether FEC mode is supported before setting it (#2333)
6565b50 Revert "[portsorch] Expose supported FEC modes to STABE_DB and check whether FEC mode is supported before setting it (#2333)" (#2396)
dc88d55 Revert hwinfo count change (#2383)
75fc965 [DualToR] Handle race condition between tunnel_decap and mux orchestrator (#2397)
525a57f Fix for remote system interface not getting created (#2364)
3161eaa portsorch: initial support for link-training (#2359)
dc477fb [swss/cfgmgr] teammgr configure lacp rate (#2121)
2489ad5 Improve pytest speend by grouping 20 tests together. (#2390)
168bd3b [EVPN]Modified tunnel creation logic when creating tunnel in VRF-VNI map creation flow (#2404)
1e1438e [portsorch] Expose supported FEC modes to STABE_DB and check whether FEC mode is supported before setting it (#2400)
9f2e27b [QoS] Fix issue: the WRED profile can not be set if current min > new max or current max < new min (#2379)
d36c17d [asan][aclorch] fix a memory leak in the SaiAttrWrapper::swap() (#2382)

Signed-off-by: Stephen Sun <[email protected]>

* More sonic-utilities PRs

be1866fd Fix GCU bug when backend service modifying config (#2295)
bcf36eb3 Fix issues for sonic_installer upgrade-docker and sonic_installer rollback-docker (#2278)

Signed-off-by: Stephen Sun <[email protected]>

Signed-off-by: Stephen Sun <[email protected]>
vivekrnv pushed a commit to vivekrnv/sonic-buildimage that referenced this pull request Aug 26, 2022
…whether FEC mode is supported before setting it (sonic-net#2333)" (sonic-net#2396)

This reverts commit dc8bc1c.
*Revert "[portsorch] Expose supported FEC modes to STABE_DB and check whether FEC mode is supported before setting it"
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Oct 6, 2022
linkmgrd:
* a5ac7f6 2022-10-05 | [Active-Active] Post link prober stats to state db  (sonic-net#140) (HEAD -> 202205, github/202205) [Jing Zhang]
* f4b0e53 2022-10-05 | [Active-Active] Retry config mux mode standby (sonic-net#139) [Jing Zhang]

utilities:
* a255838 2022-10-04 | [minigraph] new workflow for golden path (sonic-net#2396) (HEAD -> 202205, github/202205) [jingwenxie]
* 99425a8 2022-10-03 | [actions] Support Semgrep by Github Actions (sonic-net#2417) [Mai Bui]
* f41e4d1 2022-09-30 | Fix for show vxlan tunnel command display issue sonic-net#11902 (sonic-net#2391) [Senthil Bhava]
* e1d827e 2022-09-29 | [VxLAN]Fix Vxlan delete command to throw error when there are references (sonic-net#2404) [Sudharsan Dhamal Gopalarathnam]
* d77acf8 2022-09-28 | [doc] add documentation on automatic techsupport based on memory (sonic-net#2411) [Stepan Blyshchak]
* 2cfc75a 2022-09-28 | [doc] update "config feature" section with "--block" option (sonic-net#2409) [Stepan Blyshchak]
* 9dc8471 2022-09-28 | [Vxlanmgrd] [CPA] Update the vxlan_tunnel name len to be under IFNAMIZ to overcome netdev creation failure (sonic-net#2398) [Vivek]
* 342589e 2022-10-03 | Added cisco config platform commands (sonic-net#2242) (sonic-net#2418) [yucgu]

swss:
* 9d9f395 2022-10-04 | [intfmgr]: Enable `accept_untracked_na` kernel param (sonic-net#2436) (HEAD -> 202205, github/202205) [Lawrence Lee]
* 6b6d25d 2022-10-04 |  [orchdaemon]: Fixed sairedis record file rotation (sonic-net#2480) [Bryan Crossland]

Signed-off-by: Ying Xie <[email protected]>
yxieca added a commit that referenced this pull request Oct 6, 2022
linkmgrd:
* a5ac7f6 2022-10-05 | [Active-Active] Post link prober stats to state db  (#140) (HEAD -> 202205, github/202205) [Jing Zhang]
* f4b0e53 2022-10-05 | [Active-Active] Retry config mux mode standby (#139) [Jing Zhang]

utilities:
* a255838 2022-10-04 | [minigraph] new workflow for golden path (#2396) (HEAD -> 202205, github/202205) [jingwenxie]
* 99425a8 2022-10-03 | [actions] Support Semgrep by Github Actions (#2417) [Mai Bui]
* f41e4d1 2022-09-30 | Fix for show vxlan tunnel command display issue #11902 (#2391) [Senthil Bhava]
* e1d827e 2022-09-29 | [VxLAN]Fix Vxlan delete command to throw error when there are references (#2404) [Sudharsan Dhamal Gopalarathnam]
* d77acf8 2022-09-28 | [doc] add documentation on automatic techsupport based on memory (#2411) [Stepan Blyshchak]
* 2cfc75a 2022-09-28 | [doc] update "config feature" section with "--block" option (#2409) [Stepan Blyshchak]
* 9dc8471 2022-09-28 | [Vxlanmgrd] [CPA] Update the vxlan_tunnel name len to be under IFNAMIZ to overcome netdev creation failure (#2398) [Vivek]
* 342589e 2022-10-03 | Added cisco config platform commands (#2242) (#2418) [yucgu]

swss:
* 9d9f395 2022-10-04 | [intfmgr]: Enable `accept_untracked_na` kernel param (#2436) (HEAD -> 202205, github/202205) [Lawrence Lee]
* 6b6d25d 2022-10-04 |  [orchdaemon]: Fixed sairedis record file rotation (#2480) [Bryan Crossland]

Signed-off-by: Ying Xie <[email protected]>

Signed-off-by: Ying Xie <[email protected]>
wen587 added a commit to wen587/sonic-buildimage that referenced this pull request Oct 10, 2022
423779410 [muxcable][config] add CLI support for mux mode detach (sonic-net#2425)
a817896b1 YANG validation for ConfigDB Updates: MGMT_INTERFACE, PORTCHANNEL_MEMBER use cases (sonic-net#2420)
81e2aecca [minigraph] new workflow for golden path (sonic-net#2396)
c1206aac3 ConfigDB Updates with YANG Validation: Include potential for YANG validation even when adhoc validation is used (sonic-net#2412)
57c509a9d [show] vnet endpoint [ip/ipv6] command (sonic-net#2342)
4b2b766ac [actions] Support Semgrep by Github Actions (sonic-net#2417)
156257e2a check for vxlan mapping before removing vlan (sonic-net#2388)
cb0edd310 Fix for show vxlan tunnel command display issue sonic-net#11902 (sonic-net#2391)
ac71d745d [VxLAN]Fix Vxlan delete command to throw error when there are references (sonic-net#2404)
7419c6731 Added cisco config platform commands (sonic-net#2242)
8760bbe80 Add UT to check sonic installer does not depend on database (sonic-net#2401)
6bef65260 [doc] add documentation on automatic techsupport based on memory (sonic-net#2411)
4a783745f [doc] update "config feature" section with "--block" option (sonic-net#2409)
dd6210fcc [Vxlanmgrd] [CPA] Update the vxlan_tunnel name len to be under IFNAMIZ to overcome netdev creation failure (sonic-net#2398)
bdc4a8a60 Fix broken pipeline build URL (sonic-net#2363)
b31681b43 Fix display disorder problem of show vrf  (sonic-net#2392)
123504a85 YANG validation for ConfigDB Updates: portchannel add/remove, loopback interface, VLAN
28f6820c6 [link-local]Modify RIF check to include link-local enabled interfaces (sonic-net#2394)
tshalvi pushed a commit to tshalvi/sonic-buildimage that referenced this pull request Dec 20, 2022
…FEC mode is supported before setting it (sonic-net#2400)

* Revert "Revert "[portsorch] Expose supported FEC modes to STABE_DB and check whether FEC mode is supported before setting it (sonic-net#2333)" (sonic-net#2396)"

This reverts commit 6565b50.

* Adjust the prototype of setPortFec

Signed-off-by: Stephen Sun <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants