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

merged 1 commit into from
Jan 15, 2019

Conversation

jleveque
Copy link
Contributor

@jleveque jleveque commented Jan 15, 2019 •
edited
Loading

When configuring the management port for LLDP, if the management port has a port alias available, we use it as the Port ID subtype. If an alias does not exist, we simply use the management port name.

@jleveque jleveque self-assigned this Jan 15, 2019
@jleveque jleveque requested a review from lguohan January 15, 2019 01:48
lguohan
lguohan reviewed Jan 15, 2019
View reviewed changes
dockers/docker-lldp-sv2/lldpd.conf.j2
@@ -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.

@lguohan
Copy link
Collaborator

lguohan commented Jan 15, 2019

can this change apply to 201803 branch?

@lguohan lguohan merged commit 3c67c70 into sonic-net:master Jan 15, 2019
@jleveque
Copy link
Contributor Author

@lguohan: Yes, this PR will apply cleanly to the 201803 branch. I recommend cherry-picking it.

@jleveque jleveque deleted the lldp_mgmt_port_subtype_alias branch January 15, 2019 23:32
@yxieca
Copy link
Contributor

yxieca commented Jan 16, 2019

Made to 201811 branch on 1/16/2019

yxieca pushed a commit that referenced this pull request Jan 16, 2019
@jleveque @yxieca
[lldp] For MGMT port, if port alias is available, use it for Port ID …
2abecef 
…subtype; otherwise use port name (#2445)
lguohan pushed a commit to lguohan/sonic-buildimage that referenced this pull request Jan 25, 2019
@jleveque @lguohan
[lldp] For MGMT port, if port alias is available, use it for Port ID …
a67a937 
…subtype; otherwise use port name (sonic-net#2445)
@zbud-msft zbud-msft mentioned this pull request Sep 15, 2022
Closed
7 tasks
theasianpianist added a commit to theasianpianist/sonic-buildimage that referenced this pull request Oct 5, 2022
@theasianpianist
[swss]: Submodule update
4c2aea0 
Include:

df92fb7 Improve verbosity level and provide more info in the log (sonic-net#2472)
e81ed20 [intfmgr]: Enable `accept_untracked_na` kernel param (sonic-net#2436)
24d29f1 [orchdaemon]: Fixed sairedis record file rotation (sonic-net#2299)
b8ee07d [build] add missing package libyang-dev in lgtm.yml (sonic-net#2475)
e46dd29 [crm] Fix issue with continues EXCEEDED and CLEAR logs for ACL group/table counters (sonic-net#2463)
b61d24c [doc]: Update README.md (sonic-net#2456)
b9ade5d [orchagent] Fix issue: ip prefix shall be inited even if VRF/VNET is not ready (sonic-net#2461)
f0f1eb4 Revert "[counters] Improve performance by polling only configured ports buffer queue/pg counters (sonic-net#2360)" (sonic-net#2458)
3d757a8 [ci][asan] add DVS tests run with ASAN (sonic-net#2441)
04fbc8e [ci] Only when test stage succeeded or succeededwithissues, PR run Gcov (sonic-net#2460)
7cc035f [orchagent]: Publish identified events via structured-events channel (sonic-net#2446)
efa0f01 [QoS] Enforce drop probability only for colors whose WRED are enabled (sonic-net#2422)
05c5c2f [swss] Replace memset functions (sonic-net#2423)
9ff993d Modified the test file to remove click commands and do the REDIS-DB u… (sonic-net#2264)
9e376af Install libyang in azure pipeline. (sonic-net#2445)
c1eb99a check state_db for po before sending ARP/ND pkts (sonic-net#2444)
43cc486 [portmgr] Fixed the orchagent crash due to late arrival of notif (sonic-net#2431)
b62c716 Enhance orchagent and buffer manager in error handling (sonic-net#2414)
13bda3c [Everflow/ERSPAN] Set correct destination port and mac address when the nexthop is updated for ERSPAN mirror destination (sonic-net#2392)
0ccb315 Revert "[VS Test] Skip failing subport tests (sonic-net#2370)" (sonic-net#2421)
ac8a83f [UT] [Portsyncd] Added Unit Tests for portsyncd (sonic-net#2297)
83a186a Change the log messages in addKernelNeigh/Route from ERROR to INFO (sonic-net#2437)
9c23389 [BFD]Clean up state_db BFD entries on swss restart (sonic-net#2434)
d41aebf EntityBulker SIGSEGV when create_entry attr_count 0 (sonic-net#2224)
f52a7b1 Fix the Fec Mode Setting of gbsyncd (sonic-net#2430)
8cc0a45 [neighsyncd] Enabling ipv4 link local entries for non-dualtor (sonic-net#2427)
5624e87 Revert "[ci][asan] add DVS tests run with ASAN (sonic-net#2363)" (sonic-net#2433)
a26b26a Dynamic port configuration - add port buffer cfg to the port ref counter (sonic-net#2194)
486939a tlm_teamd: Filter portchannel subinterface events from STATE_DB LAG_TABLE (sonic-net#2408)
a4b8992 [counters] Improve performance by polling only configured ports buffer queue/pg counters (sonic-net#2360)
4aaeec9 added support for Xsight platform (sonic-net#2426)
ca9edca [ci][asan] add DVS tests run with ASAN (sonic-net#2363)
dec4570 Handle dual ToR neighbor miss scenario (sonic-net#2151)
9eb4422 Upstream new development on p4orch (sonic-net#2237)
e9be2c0 [lgtm] Fix dependency (sonic-net#2419)
c0168f3 [muxorch] Returning true if nbr in skip_neighbor_ in isNeighborActive() (sonic-net#2415)
cfcf3d8 [macsec]: Set MTU for MACsec (sonic-net#2398)
8346034 Delete Invalid if condition in intfsorch.cpp (sonic-net#2411)

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
theasianpianist added a commit that referenced this pull request Oct 7, 2022
@theasianpianist
[swss]: Submodule update (#12286)
a45a455 
Include:

df92fb7 Improve verbosity level and provide more info in the log (#2472)
e81ed20 [intfmgr]: Enable `accept_untracked_na` kernel param (#2436)
24d29f1 [orchdaemon]: Fixed sairedis record file rotation (#2299)
b8ee07d [build] add missing package libyang-dev in lgtm.yml (#2475)
e46dd29 [crm] Fix issue with continues EXCEEDED and CLEAR logs for ACL group/table counters (#2463)
b61d24c [doc]: Update README.md (#2456)
b9ade5d [orchagent] Fix issue: ip prefix shall be inited even if VRF/VNET is not ready (#2461)
f0f1eb4 Revert "[counters] Improve performance by polling only configured ports buffer queue/pg counters (#2360)" (#2458)
3d757a8 [ci][asan] add DVS tests run with ASAN (#2441)
04fbc8e [ci] Only when test stage succeeded or succeededwithissues, PR run Gcov (#2460)
7cc035f [orchagent]: Publish identified events via structured-events channel (#2446)
efa0f01 [QoS] Enforce drop probability only for colors whose WRED are enabled (#2422)
05c5c2f [swss] Replace memset functions (#2423)
9ff993d Modified the test file to remove click commands and do the REDIS-DB u… (#2264)
9e376af Install libyang in azure pipeline. (#2445)
c1eb99a check state_db for po before sending ARP/ND pkts (#2444)
43cc486 [portmgr] Fixed the orchagent crash due to late arrival of notif (#2431)
b62c716 Enhance orchagent and buffer manager in error handling (#2414)
13bda3c [Everflow/ERSPAN] Set correct destination port and mac address when the nexthop is updated for ERSPAN mirror destination (#2392)
0ccb315 Revert "[VS Test] Skip failing subport tests (#2370)" (#2421)
ac8a83f [UT] [Portsyncd] Added Unit Tests for portsyncd (#2297)
83a186a Change the log messages in addKernelNeigh/Route from ERROR to INFO (#2437)
9c23389 [BFD]Clean up state_db BFD entries on swss restart (#2434)
d41aebf EntityBulker SIGSEGV when create_entry attr_count 0 (#2224)
f52a7b1 Fix the Fec Mode Setting of gbsyncd (#2430)
8cc0a45 [neighsyncd] Enabling ipv4 link local entries for non-dualtor (#2427)
5624e87 Revert "[ci][asan] add DVS tests run with ASAN (#2363)" (#2433)
a26b26a Dynamic port configuration - add port buffer cfg to the port ref counter (#2194)
486939a tlm_teamd: Filter portchannel subinterface events from STATE_DB LAG_TABLE (#2408)
a4b8992 [counters] Improve performance by polling only configured ports buffer queue/pg counters (#2360)
4aaeec9 added support for Xsight platform (#2426)
ca9edca [ci][asan] add DVS tests run with ASAN (#2363)
dec4570 Handle dual ToR neighbor miss scenario (#2151)
9eb4422 Upstream new development on p4orch (#2237)
e9be2c0 [lgtm] Fix dependency (#2419)
c0168f3 [muxorch] Returning true if nbr in skip_neighbor_ in isNeighborActive() (#2415)
cfcf3d8 [macsec]: Set MTU for MACsec (#2398)
8346034 Delete Invalid if condition in intfsorch.cpp (#2411)

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
richardyu-ms pushed a commit to richardyu-ms/sonic-buildimage that referenced this pull request Nov 16, 2022
@yxieca
Merged PR 6880849: Manual merge github master to internal branch
2b16e56 
Related work items: sonic-net#2151, sonic-net#2194, sonic-net#2224, sonic-net#2237, sonic-net#2264, sonic-net#2281, sonic-net#2286, sonic-net#2297, sonic-net#2299, sonic-net#2305, sonic-net#2325, sonic-net#2335, sonic-net#2338, sonic-net#2341, sonic-net#2343, sonic-net#2347, sonic-net#2350, sonic-net#2355, sonic-net#2356, sonic-net#2358, sonic-net#2360, sonic-net#2363, sonic-net#2367, sonic-net#2368, sonic-net#2370, sonic-net#2374, sonic-net#2392, sonic-net#2398, sonic-net#2408, sonic-net#2414, sonic-net#2415, sonic-net#2419, sonic-net#2421, sonic-net#2422, sonic-net#2423, sonic-net#2426, sonic-net#2427, sonic-net#2430, sonic-net#2431, sonic-net#2433, sonic-net#2434, sonic-net#2436, sonic-net#2437, sonic-net#2441, sonic-net#2444, sonic-net#2445, sonic-net#2446, sonic-net#2456, sonic-net#2458, sonic-net#2460, sonic-net#2461, sonic-net#2463, sonic-net#2472, sonic-net#2475, sonic-net#11877, sonic-net#12024, sonic-net#12065, sonic-net#12097, sonic-net#12130, sonic-net#12209, sonic-net#12217, sonic-net#12244, sonic-net#12251, sonic-net#12255, sonic-net#12276, sonic-net#12284
tshalvi pushed a commit to tshalvi/sonic-buildimage that referenced this pull request Dec 20, 2022
@liuh-80
Install libyang in azure pipeline. (sonic-net#2445)
9e376af 
#### Why I did it
sonic-swss-common lib will add depency to libyang, so need install libyang lib to prevent build and UT break.

#### How I did it
Modify azure pipeline to install libyang in azure pipeline steps.

#### How to verify it
Pass all UT.

#### Which release branch to backport (provide reason below if selected)

#### Description for the changelog
Modify azure pipeline to install libyang in azure pipeline steps.

#### Link to config_db schema for YANG module changes

#### A picture of a cute animal (not mandatory but encouraged)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lguohan lguohan lguohan approved these changes

Assignees

@jleveque jleveque

Labels
Enhancement ➕ Included in 201811 Branch Request for 201811 Branch :shipit:
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jleveque @lguohan @yxieca