[decap] fix incorrect intervals issue / [minigraph] change method to follow the instruction of SONiC wiki page#282
[decap] fix incorrect intervals issue / [minigraph] change method to follow the instruction of SONiC wiki page#282okanchou9 wants to merge 2 commits intosonic-net:masterfrom okanchou9:master
Conversation
stcheng
left a comment
There was a problem hiding this comment.
I think the test of config load_minigraph is a good test that we could consider to add. Besides, could you separate this pull request into two different ones so that each could target on one specific issue? thanks!
| self._ipv4_lpm_dict = LpmDict() | ||
| for ip in EXCLUDE_IPV4_PREFIXES: | ||
| self._ipv4_lpm_dict[ip] = self.NextHop() | ||
| # no need to add EXCLUDE_IPV4_PREFIXES into test |
There was a problem hiding this comment.
could you point out why about this code change?
There was a problem hiding this comment.
As the name of this variable, "EXCLUDE_IPV4_PREFIXES" should be a list of IP ranges that we need to exclude from decap test. Somehow this script join those excluded IP ranges into test at this section and cause fail the decap test while checking incorrect IP ranges. The simple way to prevent this issue is just comment out this section.
| else: | ||
| interval = self.IpInterval(sorted_boundaries[index], ip_address(u'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff')) | ||
| ranges.append(interval) | ||
| # add this to prevent incorrect intervals generated by IpInterval |
There was a problem hiding this comment.
could you list an example about the incorrect intervals generated by IpInterval?
| async: 1 | ||
| poll: 0 | ||
|
|
||
| - name: pip install pexpect to support ansible expect module |
There was a problem hiding this comment.
we could update the sonic-buildimage to install this module by default inside the docker.
There was a problem hiding this comment.
You are right, will add this module into sonic-buildimage by default inside the docker.
|
Sure, I'll close this pull request and raise other 2 pull request for those 2 different issues. Regards, |
…#282) <!-- 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: Fixes # (issue) ### Type of change <!-- - Fill x for your type of change. - e.g. - [x] Bug fix --> - [x] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] New Test case - [ ] Skipped for non-supported platforms - [ ] Test case improvement ### Back port request - [ ] 202012 - [ ] 202205 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 ### Approach #### What is the motivation for this PR? Add default routes to t1-isolated-d128 through it's t0 peers via BGP as this topo does not have t2 peers. #### How did you do it? Update announce_routes.py #### How did you verify/test it? Checked that default routes were added on DUT #### 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? -->
) ``` 81505c8 (az_upstream/202412) Merge branch '202411' of https://github.com/sonic-net/sonic-mgmt into 202412 30b7d73 (pub_upstream/202411) [202411 ] Updating the BGP, Reboot and LACP convergence cases to latest Snappi Api Model instead of Snappi_convergence module [ PR 18044 ] (sonic-net#18391) e146100 [action] [PR:18292] Fix Skip tests if no portchannels are found in prepare_test_port fixture (sonic-net#280) d8b9193 [action] [PR:17985] [tests_mark_conditions.yaml]: Skip GNMI/ZMQ test for isolated topology (sonic-net#281) ef951e6 [action] [PR:17943] Add default routes to t1-isolated-d128 (sonic-net#282) 2d3aec5 [action] [PR:18341] [route/test_route_perf] Support reading l3_alpm_template from config.bcm for TH5 platforms (sonic-net#284) 6390c7d [202412][PR: 18350] disable default pfcwd for all lossy DUT (sonic-net#271) b621644 [Cherry-pick] modifying Ignore message for 'Failed to get port by bridge port ID' (sonic-net#263) bc9a2d2 modifying Ignore message for 'Failed to get port by bridge port ID' ```
Update sonic-linux-kernel submodule pointer to include the following: * [202012][patch] mlxsw: i2c: Prevent transaction execution for special chip states ([sonic-net#282](sonic-net/sonic-linux-kernel#282)) Signed-off-by: dprital <drorp@nvidia.com>
…aemon] advance submodule head (sonic-net#11652) linkmgrd: * 17240f1 2022-08-02 | [active-active] Update unhealthy label definition (sonic-net#102) (HEAD -> 202205, github/202205) [Jing Zhang] * 99a7b4b 2022-07-28 | Update the definition of healthy label (sonic-net#99) [Jing Zhang] * 551144b 2022-08-08 | [Active-Standby]Remove unnecessary `handleMuxWaitTimeout` logs (sonic-net#100) [Jing Zhang] utilities: * 8cbbe4f 2022-08-08 | [crm] add checking for CRM interval range (sonic-net#2293) (HEAD -> 202205, github/202205) [Andriy Yurkiv] * 7dac7a7 2022-08-03 | Fix version in db_migrator for `PORT_QOS_MAP|global` (#2289) [bingwang-ms] * e14f0c9 2022-08-03 | Add override testcase to verify removal (#2288) [jingwenxie] * 61ea21d 2022-07-29 | [watermarkstat] Fix CLI script for unconfigured PG counters (sonic-net#2239) [Nazarii Hnydyn] * e206e2d 2022-05-19 | [portconfig] Allow to configure interface mtu for physical ports only [Sudharsan Dhamal Gopalarathnam] * 9751479 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#2285) [Liu Shilong] * 218b175 2022-07-29 | [202205][counters] Keep counters cache in a single directory (sonic-net#2280) [Stepan Blyshchak] swss: * d772a70 2022-08-09 | [muxorch] return true if the nbr IP is in the skip_neighbors list (sonic-net#2407) (HEAD -> 202205) [Nikola Dancejic] * a3ac275 2022-08-08 | [EVPN]Modified tunnel creation logic when creating tunnel in VRF-VNI map creation flow (sonic-net#2404) (HEAD -> 202205) [Sudharsan Dhamal Gopalarathnam] * 67c1376 2022-08-09 | [QoS] Fix issue: the WRED profile can not be set if current min > new max or current max < new min (sonic-net#2379) [Stephen Sun] * 0295a35 2022-07-21 | [Buffer Orch] Support removing buffer port profile list (sonic-net#2371) [Stephen Sun] * 450e9ec 2022-07-07 | Fix: missing sonic-db-cli in docker-sonic-vs image (sonic-net#2357) [Qi Luo] * c1c1147 2022-06-02 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#2308) [Qi Luo] swss-common: * 749cd6f 2022-07-21 | Fix PING database command not backward compatible with python version issue. (sonic-net#650) (HEAD -> 202205) [Hua Liu] * 4fa7484 2022-06-27 | Fix: missing sonic-db-cli in docker-sonic-vs image (sonic-net#640) [Qi Luo] * 4d0dc7a 2022-06-23 | [sonic-cli] Fix sonic-db-cli output format not backward compatible with python version issue. (sonic-net#631) [Hua Liu] * c5573fe 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#628) [Qi Luo] * 0ade483 2022-08-02 | Add docker-mux related table names (sonic-net#627) [Jing Zhang] * 675d793 2022-05-26 | Re-write sonic-db-cli with c++ for sonic startup performance issue (sonic-net#607) [Hua Liu] * 1155773 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#661) (github/202205) [Liu Shilong] sairedis: * c62a453 2022-06-03 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#1057) (HEAD -> 202205) [Qi Luo] * 8be9292 2022-07-20 | [syncd] Remove error message when tryTranslateVidToRid fails (sonic-net#1048) [Kamil Cudnik] * eb552ee 2022-08-01 | Transfer organization from Azure to sonic-net (sonic-net#1099) (github/202205) [Liu Shilong] platform-daemon: * d150229 2022-08-11 | Correct the peer forwarding state table (sonic-net#281) (HEAD -> 202205) [Longxiang Lyu] * 9507e6c 2022-08-10 | [ycabled] remove some spurious logs (sonic-net#282) (HEAD -> 202205) [vdahiya12] Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Hi,
Just commit the bug-fix for the issue I found for IPv4 Decap script:
#272
Also modify the config_sonic_basedon_testbed.yml to fit the configuration method of which provide by SONiC wiki page:
https://github.com/Azure/SONiC/wiki/Configuration
Please let me know if any, thanks.
Sincerely yours,
Kenie Liu