Revert "[minigraph-gen] fix AclInterface entries in minigraph"#539
Merged
Revert "[minigraph-gen] fix AclInterface entries in minigraph"#539
Conversation
This reverts commit 2c13a8d.
praveen-li
pushed a commit
to praveen-li/sonic-mgmt
that referenced
this pull request
Jun 20, 2019
* msft_github/master: (111 commits) add disconnect/connect vm to testbed-cli.sh (sonic-net#566) [dhcp_relay] Increase sleep duration to allow LAG and BGP to come up (sonic-net#565) [pfcwd]: support t0-116 and clean up the code (sonic-net#563) [fanout]: remove vrf management in arista fanout deploy templates (sonic-net#562) [fanout-switch-deploy] Support multiple speeds and port breakout (sonic-net#561) [extract_log] Improve extract_log script (sonic-net#559) Disable upgrade_sonic retry (sonic-net#560) Support for Sonic fanout (sonic-net#555) [Fanout deploy template] enable root user on fanout switches (sonic-net#557) [link state] match exact dut name in the link list (sonic-net#556) [pfcwd]: cache the ansible facts (sonic-net#554) Fix kernel version check (sonic-net#553) [pfcwd]: increase the pause waiting time and ingore snmp errors (sonic-net#551) fix typo (sonic-net#552) [dir_bcast] enable dir_bcast test on t0-116 topology (sonic-net#550) use command to gather host distribution, kernel version facts (sonic-net#549) [minigraph templte] use consistent VLAN subnet (sonic-net#546) [VM config] skip podset 0 tor 0 routing entry (sonic-net#545) Remove job minigraph_facts from boot_onie (sonic-net#548) [fast-reboot] pass VM IP in as ASCII strings (sonic-net#547) [fast-reboot test] fix syslog reading issue (sonic-net#543) add dataacl to minigraph template (sonic-net#544) [service_acl] Make test reliable when testing Arista service ACL solution (sonic-net#542) [pfcwd]: Iterate functional test over all ports (sonic-net#490) [service_acl] Detect expected output message even if it is followed by other text (sonic-net#541) [testbed]: Remove connection local for port_alias module (sonic-net#540) Revert "[minigraph-gen] fix AclInterface entries in minigraph (sonic-net#538)" (sonic-net#539) [minigraph-gen] fix AclInterface entries in minigraph (sonic-net#538) add retries in onie installation (sonic-net#537) Use connection plugin to install sonic image in ONIE. (sonic-net#536) [dhcp_relay]: Add --relax flag to ptf command (sonic-net#535) [minigraph_facts] use minigraph on DUT (sonic-net#534) Fix minigraph_facts: mkdir recursively (sonic-net#533) [minigraph_facts] use mingraph on DUT to test (sonic-net#532) generate minigraph based on topology file (sonic-net#531) Need to double-escape when using 'args' syntax (sonic-net#529) Fix improper 'local_action' syntax (sonic-net#528) Unify style of 'wait_for' actions across playbooks (sonic-net#527) [minigraph_facts] retrieving dhcp server list from vlan configuration instead of DhcpResources (sonic-net#526) [snmp_facts] increase get command timeout to fix cpu test failure (sonic-net#525) [everflow_test]: Add copy ptftests folder to use the remote.py file (sonic-net#522) Fix snmp_facts on PSU oid (sonic-net#520) Fix snmp queue test (sonic-net#519) [lag_test]: Remove the unnecessary testbed_type check (sonic-net#518) [ip_decap_test]: Support t0-64 topology (sonic-net#517) [acl_test]: Copy ptftests folder for the remote.py file (sonic-net#516) Add test case for PSU (sonic-net#514) [mtu]: Add t1-64-lag topology support for MTU test (sonic-net#513) [ip_decap]: Add t1-64-lag support in the script for the list of source port (sonic-net#512) [everflow]: Add missing spaces in ptf command (sonic-net#511) [acl_test]: Add ptf_platform_dir: ptftests to use customized platform code to support 64 ports (sonic-net#510) [crm]: Implement test for CRM (sonic-net#473) [everflow]: Add support for t1-64-lag topology (sonic-net#502) Fix sonic_image_version: get from sonic_version.yml, no dependency on grub (sonic-net#508) [topology]: Update t1-64-lag topology template to add AclInterfaces piece (sonic-net#505) Pull syncd-rpc with sonic version tag (sonic-net#507) Remove leading and trailing whitespaces when reading veos file (sonic-net#506) [lag_2] remove hard coded interval_count so it can be set by test (sonic-net#503) ptf_runner: Add one line comment for ptf_platform_dir (sonic-net#501) [testbed]: add port speed and fec configuration in sonic fanout (sonic-net#498) [typo]: Replace string t1-lag-64 with t1-64-lag (sonic-net#499) Adding sensor data for S6100 (sonic-net#496) [fib_test]: Add t1-64-lag src_ports in FIB test (sonic-net#497) Fix typo in acl test case name (sonic-net#494) Add one more Mellanox SKU string in everflow_tb_test script (sonic-net#495) Adding sensor data for Z9100 (sonic-net#492) [service_acl] Make test more robust and efficient (sonic-net#489) [dhcp relay test] adding more test scenarios (sonic-net#440) fix sanity check failed to recover (sonic-net#488) Fix PFC_WD test (sonic-net#479) add sonic fanout support (sonic-net#485) Update README.test.md Update README.test.md Fix table caption in testbed.csv and documentation (sonic-net#482) [test case] Add test: restart swss service (sonic-net#483) Add test case port toggle (sonic-net#484) [test infrastructure] allow overriding recover system actioin (sonic-net#480) [SNMP]add new SNMP counters tests to snmp.yml (sonic-net#477) add t0-52 topology (sonic-net#476) add command line option for creategraph.py (sonic-net#475) Add support for additional timestamp format (sonic-net#474) Ignore ansible output in extract_log (sonic-net#472) Add extract_logs action to concatenate logs after log rotate (sonic-net#471) Add ACL ICMP test (sonic-net#2) (sonic-net#465) [pfcwd]:add docker exec to avoid tty error (sonic-net#470) [test_tag]remove pfc_wd test tag from test by tag main yaml (sonic-net#469) [ansible]gather fact by default (sonic-net#468) [sensors]fix Dell S6000 sensors test fail (sonic-net#462) [vlan]improve test to wait a bit longer for config reload (sonic-net#463) one more place for hwsku of new Mellanox 2700 (sonic-net#464) [sensors]sensors test add new hwsku for Mellanox 2700 (sonic-net#461) [PFCWD]: test enhancement (sonic-net#456) [sensors] remove redundant sensor data definitin for sku MSN2100 (sonic-net#460) when call testcase by name, fetch all vms management info from testbed_facts (sonic-net#457) [acl test] error in ACL rule json file for destination ip (sonic-net#434) [sensor data] add sensor data for Mellanox MSN2410 and MSN2100 (sonic-net#449) Fix sku-sensors-data for 7050-QX32 (sonic-net#454) [deploy minigraph]add default enable BGP to deploy minigraph step (sonic-net#455) [upgrade]save bgp UP state after they are brough up (sonic-net#453) [reboot test] call sudo reboot to reboot dut (sonic-net#452) ...
sdszhang
pushed a commit
to sdszhang/sonic-mgmt
that referenced
this pull request
Aug 2, 2025
…4.x version (sonic-net#539) <!-- 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: With exabgp version 4.x, it doesn't accept "withdraw attribute", only accepting "withdraw attributes". The issue has been fixed in Exa-Networks/exabgp@2946f34, but it's not included in 4.2.x version yet. When running test_bgp_suppress_fib.py test case, it will failed to withdraw the routes, and result in following failures. ``` vmhost = <EosHost VM92012>, route_list = ['91.0.1.0/24', '91.0.2.0/24'] bgp_neighbor = '10.0.0.192', vrf = 'default', ip_ver = 4, exist = False def validate_route_propagate_status(vmhost, route_list, bgp_neighbor, vrf=DEFAULT, ip_ver=IP_VER, exist=True): """ Verify ipv4 or ipv6 route propagate status :param vmhost: vm host object :param route_list: ipv4 or ipv6 route list :param bgp_neighbor: ipv4 or ipv6 bgp neighbor address :param vrf: vrf name :param ip_ver: ip version number :param exist: route expected status """ if exist: pytest_assert(wait_until(30, 2, 0, check_propagate_route, vmhost, route_list, bgp_neighbor, ip_ver), "Vrf:{} - route:{} is not propagated to T2 VM {}".format(vrf, route_list, vmhost)) else: > pytest_assert( wait_until(30, 2, 0, check_propagate_route, vmhost, route_list, bgp_neighbor, ip_ver, ACTION_NOT_IN), "Vrf:{} - route:{} is propagated to T2 VM {}".format(vrf, route_list, vmhost)) E Failed: Vrf:default - route:['91.0.1.0/24', '91.0.2.0/24'] is propagated to T2 VM <EosHost VM92012> ``` With the recent PTF upgrade, we'd better to "withdraw attributes" to work with 4.x version instead of waiting for a new exabgp release. Here is the output on exabgp 4.x version: ``` root@99cb0373d021:~# exabgp --version ExaBGP : 4.2.25 Python : 3.11.2 (main, Apr 28 2025, 14:11:48) [GCC 12.2.0] Uname : Linux 99cb0373d021 5.15.0-140-generic sonic-net#150-Ubuntu SMP Sat Apr 12 06:00:09 UTC 2025 x86_64 Root : /root/env-python3 root@99cb0373d021:~# ==> exabgp-ARISTA249T0.out.log <== ...... 03:46:59 | 810 | api | command from process not understood : withdraw attribute next-hop self nlri 91.0.1.0/25 ``` ### 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 ### Approach #### What is the motivation for this PR? Fix test_bgp_suppress_fib.py failure #### How did you do it? use `withdraw attributes` which works for both exabgp 3.x and 4.x version. #### How did you verify/test it? Result on exabgp 4.x version: ``` 04:42:34 | 810 | api | route added to neighbor 10.10.247.2 local-ip 10.10.246.254 local-as 64032 peer-as 64032 router-id 10.10.246.254 family-allowed in-open : 91.0.1.0/25 next-hop self 04:42:48 | 810 | api | route removed from neighbor 10.10.247.2 local-ip 10.10.246.254 local-as 64032 peer-as 64032 router-id 10.10.246.254 family-allowed in-open : 91.0.1.0/25 next-hop self ``` Result on exabgp 3.x version: ``` ==> exabgp-ARISTA09T0.out.log <== Mon, 14 Jul 2025 04:42:20 | INFO | 817 | processes | Command from process http-api : announce attributes next-hop self nlri 91.0.1.0/25 Mon, 14 Jul 2025 04:42:20 | INFO | 817 | reactor | Route added to neighbor 10.10.246.10 local-ip 10.10.246.254 local-as 64002 peer-as 64002 router-id 10.10.246.254 family-allowed in-open : 91.0.1.0/25 next-hop 10.10.246.254 Mon, 14 Jul 2025 04:42:21 | INFO | 817 | reactor | Performing dynamic route update Mon, 14 Jul 2025 04:42:21 | INFO | 817 | reactor | Updated peers dynamic routes successfully ==> exabgp-ARISTA09T0.out.log <== Mon, 14 Jul 2025 04:42:25 | INFO | 817 | processes | Command from process http-api : withdraw attributes next-hop self nlri 91.0.1.0/25 Mon, 14 Jul 2025 04:42:25 | INFO | 817 | reactor | Route removed : 91.0.1.0/25 next-hop 10.10.246.254 Mon, 14 Jul 2025 04:42:26 | INFO | 817 | reactor | Performing dynamic route update Mon, 14 Jul 2025 04:42:26 | INFO | 817 | reactor | Updated peers dynamic routes successfully ``` #### 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
… automatically (sonic-net#21658) #### Why I did it src/sonic-platform-common ``` * 5dde3ec - (HEAD -> 202405, origin/202405) Add 800G innolight PNs (sonic-net#539) (10 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
kazinator-arista
pushed a commit
to kazinator-arista/sonic-mgmt
that referenced
this pull request
Mar 4, 2026
* 8f52e29 2018-07-25 | Postpone intf task after buffer configuration applied on the port. (sonic-net#539) (HEAD, origin/201803) [Jipan Yang] * 2d2fdaa 2018-07-26 | [portsorch]: Refix: Don't print error when alias equal to PortConfigDone (sonic-net#548) [Qi Luo] * 87d34db 2018-07-12 | [MirrorOrch]: Fix bug when NULL is returned from the getenv function (sonic-net#537) [Shuotian Cheng]
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts #538