Skip to content

Temporarily disable test_lldp.py to unblock mutually dependent LLDP fixes#2451

Merged
wangxin merged 1 commit intosonic-net:masterfrom
wangxin:workaround-lldp-change
Nov 3, 2020
Merged

Temporarily disable test_lldp.py to unblock mutually dependent LLDP fixes#2451
wangxin merged 1 commit intosonic-net:masterfrom
wangxin:workaround-lldp-change

Conversation

@wangxin
Copy link
Copy Markdown
Collaborator

@wangxin wangxin commented Nov 3, 2020

Description of PR

Summary:
Fixes # (issue)
Temporarily disable test_lldp.py to unblock mutually dependent LLDP fixes

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Approach

What is the motivation for this PR?

PR #2413 and
sonic-net/sonic-buildimage#5698 depends on each other.
If PR#2413 is not merged, PR#5698 would fail PR test and cannot be merged.
If PR#2413 is merged firstly, all sonic-mgmt-pr testing would fail before a new
image with PR#5698 is ready.

How did you do it?

The workaround is to temporarily disable LLDP
for sonic-mgmt-pr testing. Merge PR#2413 to unblock PR#5698. After a new
image with PR#5698 is ready, then enable LLDP KVM testing again.

How did you verify/test it?

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

…ixes

PR #2413 and
sonic-net/sonic-buildimage#5698 depends on each other.
If PR#2413 is not merged, PR#5698 would fail PR test and cannot be merged.
If PR#2413 is merged firstly, all sonic-mgmt-pr testing would fail before a new
image with PR#5698 is ready. The workaround is to temporarily disable LLDP
for sonic-mgmt-pr testing. Merge PR#2413 to unblock PR#5698. After a new
image with PR#5698 is ready, then enable LLDP KVM testing again.

Signed-off-by: Xin Wang <[email protected]>
@wangxin wangxin requested a review from a team November 3, 2020 01:44
@yxieca yxieca requested a review from lguohan November 3, 2020 01:54
@liat-grozovik
Copy link
Copy Markdown
Collaborator

@wangxin can we move forward and merge this one for now so we can have #2413 ci validation pass?

@wangxin wangxin merged commit e547a1d into sonic-net:master Nov 3, 2020
@wangxin
Copy link
Copy Markdown
Collaborator Author

wangxin commented Nov 3, 2020

@liat-grozovik Sure, just merged.

abdosi pushed a commit to abdosi/sonic-mgmt that referenced this pull request Nov 27, 2020
…t LLDP fixes (sonic-net#2451)"

This reverts commit e547a1d.

PR# sonic-net#2413 has already been
reverted.

sonic-net/sonic-buildimage#5698 will not be merged
as this is not valid design.

Signed-off-by: Abhishek Dosi <[email protected]>
abdosi added a commit that referenced this pull request Nov 27, 2020
…t LLDP fixes (#2451)" (#2595)

This reverts commit e547a1d.

PR# #2413 has already been
reverted.

sonic-net/sonic-buildimage#5698 will not be merged
as this is not valid design.

Signed-off-by: Abhishek Dosi <[email protected]>

Co-authored-by: Abhishek Dosi <[email protected]>
@wangxin wangxin deleted the workaround-lldp-change branch November 30, 2020 09:57
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
Update sonic-swss submodule pointer to include the following:
* 8eea92e [202205][counters] Revert PR sonic-net#2432 for the buffer queue/pg counters improvement ([sonic-net#2462](sonic-net/sonic-swss#2462))
* 5d8636a [202205] Enhance orchagent and buffer manager in error handling (sonic-net#2414) ([sonic-net#2449](sonic-net/sonic-swss#2449))
* aa22237 [Everflow/ERSPAN] Set correct destination port and mac address when the nexthop is updated for ERSPAN mirror destination (sonic-net#2392) ([sonic-net#2455](sonic-net/sonic-swss#2455))
* 04ce7be check state_db for po before sending ARP/ND pkts (sonic-net#2444) ([sonic-net#2450](sonic-net/sonic-swss#2450))
* f0138a2 [portmgr] Fixed the orchagent crash due to late arrival of notif (sonic-net#2431) ([sonic-net#2451](sonic-net/sonic-swss#2451))
* 7cfde48 Change the log messages in addKernelNeigh/Route from ERROR to INFO ([sonic-net#2437](sonic-net/sonic-swss#2437))
* 2c5116e [202205][counters] Improve performance by polling only configured ports buffer queue/pg counters ([sonic-net#2432](sonic-net/sonic-swss#2432))
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
…t#12910)

utilities:
* 252910a 2022-11-29 | [drop counters] Fix CLI script for unconfigured PGs (sonic-net#2518) (HEAD -> 202205) [Lior Avramov]
* f2bf7ed 2022-11-30 | Change show kube command default value of insecure key to True (sonic-net#2517) [lixiaoyuner]
* 0a030ce 2022-12-01 | [QoS] Introduce delay to the qos reload flow (sonic-net#2503) [DavidZagury]
* d2fa21c 2022-11-02 | Disable "tag as local" when reboot (sonic-net#2451) [lixiaoyuner]

platform-daemon:
* 5532070 2022-12-01 | Remove the argument that is causing the xcvrd to crash (sonic-net#318) (HEAD -> 202205) [Vivek]

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

Signed-off-by: Ying Xie <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants