Skip to content

[LLDP] Fix lldp test to align with a bug fix#2413

Merged
wangxin merged 1 commit intosonic-net:masterfrom
shlomibitton:shlomi_lldp_test_fix
Nov 3, 2020
Merged

[LLDP] Fix lldp test to align with a bug fix#2413
wangxin merged 1 commit intosonic-net:masterfrom
shlomibitton:shlomi_lldp_test_fix

Conversation

@shlomibitton
Copy link
Contributor

Signed-off-by: Shlomi Bitton shlomibi@nvidia.com

Description of PR

Summary:
Fixes # (issue)

Type of change

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

Approach

What is the motivation for this PR?

There is a bug fix on PR sonic-net/sonic-buildimage#5698
The test fail after the change, this PR is to align the new change to the test case.

How did you do it?

Parse correct keys from mg_facts.

How did you verify/test it?

Run the test manually after applying the changes on sonic-buildimage and sonic-mgmt.

Any platform specific information?

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

Documentation

sonic-net/sonic-buildimage#5698

Signed-off-by: Shlomi Bitton <shlomibi@nvidia.com>
@shlomibitton
Copy link
Contributor Author

shlomibitton commented Oct 27, 2020

PR dependency on sonic-net/sonic-buildimage#5698

@wangxin
Copy link
Collaborator

wangxin commented Oct 29, 2020

Please hold on merging this PR until sonic-net/sonic-buildimage#5698 is merged and backported to 201911 branch. Without sonic-net/sonic-buildimage#5698 in 201911 branch image, the LLDP testing with this commit would fail.

@yxieca
Copy link
Collaborator

yxieca commented Oct 30, 2020

retest vsimage please

@shlomibitton
Copy link
Contributor Author

@yxieca This PR will fail the vsimage build unless sonic-net/sonic-buildimage#5698 is merged.
These two PR's are dependent on each other, the vsimage is failing because the test for LLDP neighbour is adapted to the new change, which is not merged yet.

@wangxin
Copy link
Collaborator

wangxin commented Nov 3, 2020

@shlomibitton @yxieca I have created a PR to temporarily disable LLDP in KVM testing to workaround this mutually dependent issue: #2451

wangxin added a commit that referenced this pull request Nov 3, 2020
…ixes (#2451)

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 <xiwang5@microsoft.com>
@wangxin
Copy link
Collaborator

wangxin commented Nov 3, 2020

retest this please

@wangxin wangxin merged commit fd6bf4e into sonic-net:master Nov 3, 2020
yxieca added a commit that referenced this pull request Nov 5, 2020
yxieca added a commit that referenced this pull request Nov 5, 2020
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 <abdosi@micrsoft.com>
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 <abdosi@micrsoft.com>

Co-authored-by: Abhishek Dosi <abdosi@micrsoft.com>
@shlomibitton shlomibitton deleted the shlomi_lldp_test_fix branch March 25, 2021 08:11
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
…et#12263)

To get following fixes:

be7da6b [sonic-installer] use host docker startup arguments when running dockerd in chroot (sonic-net#2179) (sonic-net#2407)
d112f7c [202205][auto-ts] add memory check (sonic-net#2116) (sonic-net#2413)
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
be7da6b [sonic-installer] use host docker startup arguments when running dockerd in chroot (sonic-net#2179) (sonic-net#2407)
d112f7c [202205][auto-ts] add memory check (sonic-net#2116) (sonic-net#2413)

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
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.

4 participants