Skip to content

[neighbour-mac-noptf] Fix issue 2414 by always using static arp/neighbour entry#1026

Merged
prsunny merged 9 commits intosonic-net:masterfrom
stephenxs:pr-neighbour-mac-noptf
Aug 1, 2019
Merged

[neighbour-mac-noptf] Fix issue 2414 by always using static arp/neighbour entry#1026
prsunny merged 9 commits intosonic-net:masterfrom
stephenxs:pr-neighbour-mac-noptf

Conversation

@stephenxs
Copy link
Copy Markdown
Contributor

@stephenxs stephenxs commented Jul 23, 2019

Description of PR

Summary:
Fix issue 2414 by always using static arp/neighbour entry for the neighbour-mac-noptf testcase

Type of change

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

Approach

How did you do it?

  1. alway use a static arp/neighbour for testing, since the dynamic entries are of the BGP neighbors and to change their mac address causes bgp neighbour down and route withdrew, making system busy and unable to handle mac update in time.
    we choose an interface meeting 1. routing interface 2. oper_state is up from the output of "show interface status" for the test.
  2. don't use "when" inside a nested "block" statement

How did you verify/test it?

run the testcase on t0, t1 t1-lag and ptf32

Any platform specific information?

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

Documentation

Stephen Sun added 6 commits July 22, 2019 10:38
1. fix the issue which "when" doesn't work when it is in a nested "block" statement
2. don't use the hardcoded "Ethernet0" since in topo t1-lag it belongs a PortChannel and to set ip address on such kind of interface causes orchagent terminated.
   choice a valiable routed interface for test instead.
[show_interface.py]
1. add "vlan" to int_status dict
don't use an ary/neighbour which is a bgp neighbour to do the updating neighbour's mac test,
doing in that way can cause bgp connection down and a large number of routing entries withdrawed,
failing orchagent to handle neighbour mac update in time.
use a newly added address and neighbor on an automatically selected routing interface for that test instead.
…hose oper_state are 'up' and remove startup interface stuffs
1. fix the issue which "when" doesn't work when it is in a nested "block" statement
2. alway use a static arp/neighbour for testing, since the dynamic entries are of the BGP neighbors and to change their mac address causes bgp neighbour down and route withdrew, making system busy and unable to handle mac update in time.
   we use Ethernet0 for t0 and t1, PortChannel0002 for t1-lag
Stephen Sun added 2 commits July 23, 2019 16:27
dynamically choose an interface from the output of show interface status which meets the following conditions for the test:
  1. it is a routing interface
  2. it is up.
[show_interface]
add support for the "vlan" column.
@stepanblyschak stepanblyschak requested a review from prsunny July 23, 2019 13:56
@prsunny
Copy link
Copy Markdown
Contributor

prsunny commented Aug 1, 2019

@stephanxs, I see that the test now uses 'vlan' interface. But this is not present in t1 topologies. How does it work on t1 topology?

@stephenxs
Copy link
Copy Markdown
Contributor Author

stephenxs commented Aug 1, 2019

hi Prince, it doesn't choose a vlan interface to do the test. it choose an interface which satisfies both 'up' and 'routed interface' on the dut.

@prsunny prsunny merged commit c1761f3 into sonic-net:master Aug 1, 2019
@stephenxs stephenxs deleted the pr-neighbour-mac-noptf branch August 2, 2019 05:48
lguohan pushed a commit that referenced this pull request Sep 11, 2019
[neighbour-mac-noptf] Fix issue 2414 by always using static arp/neighbour entry (#1026)

backport #1026 to 201811
fraserg-arista pushed a commit to fraserg-arista/sonic-mgmt that referenced this pull request Feb 24, 2026
<!--
Please make sure you've read and understood our contributing guidelines;
https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md

Please provide following information to help code review process a bit easier:
-->
### Description of PR
<!--
- Please include a summary of the change and which issue is fixed.
- Please also include relevant motivation and context. Where should reviewer start? background context?
- List any dependencies that are required for this change.
-->

Summary:
test_bgp_allow_list.py relies on the ALLOW_LIST route-map which comes from image.

https://github.com/sonic-net/sonic-buildimage/blob/371543340a65eb26f17ad98d394295158de3d9e9/dockers/docker-fpm-frr/frr/bgpd/templates/general/policies.conf.j2#L24

as allow_list is not needed in t1-isolated topo, which will cover both 400g.t1 and 100g.t1 hwsku.

### Type of change

<!--
- Fill x for your type of change.
- e.g.
- [x] Bug fix
-->

- [ ] Bug fix
- [ ] Testbed and Framework(new/improvement)
- [ ] New Test case
 - [ ] Skipped for non-supported platforms
- [ ] Test case improvement

### Back port request
- [ ] 202205
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [x] 202505
- [ ] 202511

### Approach
#### What is the motivation for this PR?
fix test_bgp_allow_list failure in isolated topo.

#### How did you do it?
skipped in mark condition.

#### How did you verify/test it?
local testbed.

#### Any platform specific information?

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

### Documentation
<!--
(If it's a new feature, new test case)
Did you update documentation/Wiki relevant to your implementation?
Link to the wiki page?
-->
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
…-net#3345)

* [201811] advance sairedis, swss and utilities sub module heads

Submodule src/sonic-utilities f28b720..0a3455b:
  > [neighbor_advertise]: Use the existing MIRROR ACL table (sonic-net#605)
  > [neighbor_advertiser] Use full vlan name for vxlan tunnel map programming (sonic-net#604)

Submodule src/sonic-swss f44029d..950e9db:
  > [orchagent] Add support for Innovium platform (sonic-net#1026)
  > [policerorch]: Add the capability to update policer rate/size (sonic-net#1017)

Submodule src/sonic-sairedis 992cdc0..4ee82cb:
  > [syncd] Add support for Innovium platform (sonic-net#496)

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

* [201811][utilities] advance sub module head

Submodule src/sonic-utilities 0a3455b..7460f5c:
  > [fast/warm reboot] kill radv docker before stopping BGP (sonic-net#608)

Signed-off-by: Ying Xie <ying.xie@microsoft.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.

3 participants