Don't create the members@ array in config_db for PC when reading from minigraph #13660

saiarcot895 · 2023-02-03T19:56:21Z

Signed-off-by: Saikrishna Arcot sarcot@microsoft.com

Why I did it

When loading from minigraph, for port channels, don't create the members@ array in config_db in the PORTCHANNEL table. This is no longer needed or used.

In addition, when adding a port channel member from the CLI, that member doesn't get added into the members@ array, resulting in a bit of inconsistency. This gets rid of that inconsistency.

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Description for the changelog

Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

… minigraph When loading from minigraph, for port channels, don't create the members@ array in config_db in the PORTCHANNEL table. This is no longer needed or used. In addition, when adding a port channel member from the CLI, that member doesn't get added into the members@ array, resulting in a bit of inconsistency. This gets rid of that inconsistency. Fixes sonic-net#11873. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

saiarcot895 · 2023-02-07T20:49:17Z

/azpw run Azure.sonic-buildimage

mssonicbld · 2023-02-07T20:49:19Z

/AzurePipelines run Azure.sonic-buildimage

azure-pipelines · 2023-02-07T20:49:33Z

Azure Pipelines successfully started running 1 pipeline(s).

qiluo-msft · 2023-02-10T22:07:22Z

src/sonic-config-engine/minigraph.py

@@ -532,9 +532,9 @@ def parse_dpg(dpg, hname):
                intfs_inpc.append(pcmbr_list[i])
                pc_members[(pcintfname, pcmbr_list[i])] = {}
            if pcintf.find(str(QName(ns, "Fallback"))) != None:
-                pcs[pcintfname] = {'members': pcmbr_list, 'fallback': pcintf.find(str(QName(ns, "Fallback"))).text, 'min_links': str(int(math.ceil(len() * 0.75))), 'lacp_key': 'auto'}


members

Do you want to update src/sonic-yang-models/yang-models/sonic-portchannel.yang at the same time?

@ganglyu for vis. #Closed

Yes, removed from the yang file.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

wen587 · 2023-02-13T03:13:35Z

There may have many test file need to be updated in src/sonic-yang*

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

saiarcot895 · 2023-02-17T00:43:48Z

@ganglyu @wen587 could you re-review?

wen587

LGTM

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> Description of PR Summary: Fixes sonic-net/sonic-buildimage#11873 sonic-net/sonic-buildimage#11873 Approach What is the motivation for this PR? The members entry in the PORTCHANNEL table has been removed. Switch to using PORTCHANNEL_MEMBERS instead. Related to sonic-net/sonic-buildimage#13660 sonic-net/sonic-buildimage#13660

mssonicbld · 2023-02-28T23:37:31Z

@saiarcot895 PR conflicts with 202205 branch

… minigraph (sonic-net#13660) Fixes sonic-net#11873. #### Why I did it When loading from minigraph, for port channels, don't create the members@ array in config_db in the PORTCHANNEL table. This is no longer needed or used. In addition, when adding a port channel member from the CLI, that member doesn't get added into the members@ array, resulting in a bit of inconsistency. This gets rid of that inconsistency.

mssonicbld · 2023-03-19T08:16:02Z

Cherry-pick PR to 202211: #14343

… minigraph (#13660) Fixes #11873. #### Why I did it When loading from minigraph, for port channels, don't create the members@ array in config_db in the PORTCHANNEL table. This is no longer needed or used. In addition, when adding a port channel member from the CLI, that member doesn't get added into the members@ array, resulting in a bit of inconsistency. This gets rid of that inconsistency.

KeyError: 'members' is introduced by this PR sonic-net/sonic-buildimage#13660. In original config, we use PORTCHANNEL, now it is changed to PORTCHANNEL_MEMBER. So, the relevant test should be updated accordingly. Test log: oports = [] for ifname in ifnames: if po.has_key(ifname): oports.append([str(mg_facts['minigraph_ptf_indices'][x]) for x in po[ifname]['members']]) E KeyError: 'members' What is the motivation for this PR? Fix test_inner_harhing issue How did you do it? PORTCHANNEL is changed to PORTCHANNEL_MEMBER How did you verify/test it? Run test_inner_hashing

Related work items: sonic-net#276, sonic-net#305, sonic-net#332, sonic-net#338, sonic-net#339, sonic-net#1188, sonic-net#1192, sonic-net#1197, sonic-net#1206, sonic-net#1685, sonic-net#1690, sonic-net#1696, sonic-net#1699, sonic-net#1709, sonic-net#1727, sonic-net#1737, sonic-net#1741, sonic-net#1742, sonic-net#2511, sonic-net#2512, sonic-net#2532, sonic-net#2559, sonic-net#2626, sonic-net#2638, sonic-net#2645, sonic-net#2649, sonic-net#2660, sonic-net#2669, sonic-net#2670, sonic-net#2678, sonic-net#10084, sonic-net#11442, sonic-net#11873, sonic-net#12047, sonic-net#12110, sonic-net#12207, sonic-net#12529, sonic-net#12678, sonic-net#13235, sonic-net#13287, sonic-net#13372, sonic-net#13395, sonic-net#13456, sonic-net#13497, sonic-net#13522, sonic-net#13545, sonic-net#13547, sonic-net#13552, sonic-net#13569, sonic-net#13572, sonic-net#13578, sonic-net#13591, sonic-net#13611, sonic-net#13647, sonic-net#13649, sonic-net#13660, sonic-net#13710, sonic-net#13716, sonic-net#13724, sonic-net#13726, sonic-net#13732, sonic-net#13735, sonic-net#13739, sonic-net#13757, sonic-net#13786, sonic-net#13792, sonic-net#13800, sonic-net#13801, sonic-net#13802, sonic-net#13805, sonic-net#13806, sonic-net#13812, sonic-net#13814, sonic-net#13822, sonic-net#13831, sonic-net#13834, sonic-net#13847, sonic-net#13870, sonic-net#13882, sonic-net#13884, sonic-net#13885, sonic-net#13894, sonic-net#13895, sonic-net#13926, sonic-net#13932, sonic-net#13935, sonic-net#13942, sonic-net#13951, sonic-net#13953, sonic-net#13964

anamehra · 2023-03-28T17:24:38Z

Hi @saiarcot895, I am seeing internal back plane port channels in 'show interface portchannel'. It used to display only front-end port channels and '-d all' used to display all, as expected. Could this behavior change be due to the changes in this PR?
@abdosi , FYI.

rlhui · 2023-03-29T15:03:22Z

@anamehra , please file an issue for this? Thanks.

anamehra · 2023-03-29T15:09:57Z

@anamehra , please file an issue for this? Thanks.

Hi @rlhui , raised #14459

rlhui · 2023-03-29T17:16:20Z

@saiarcot895 , @yxieca - is this PR indeed needed in 202205? please share more info, thanks

In `show interface portchannel` and `show ip route`, backend port channels and routes were being displayed. This is due to changes in sonic-net#13660. Fix these issues by switching to reading from PORTCHANNEL_MEMBERS table instead. Fixes sonic-net#14459. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

saiarcot895 · 2023-03-31T19:06:20Z

@rlhui This PR was to fix an inconsistency in how port channel members were specified in config_db.json. On regular T0 and T1 KVM devices, it appeared that there weren't any users of the members array, and that on the test script side, there appeared to be only one test case that used the members array. However, that only covered the KVM test cases, so I didn't notice the other test failures.

I requested it for 202205 and 202211 since it is a bug fix (there could be different port channel members returned depending on which table is used) and it didn't appear to cause any breakages, but because I didn't check the hardware test cases and I didn't check multi-asic, I didn't notice there would be breakages there.

* Fix backend port channels and routes being displayed In `show interface portchannel` and `show ip route`, backend port channels and routes were being displayed. This is due to changes in #13660. Fix these issues by switching to reading from PORTCHANNEL_MEMBERS table instead. Fixes #14459. * Replace table name with constant Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* Fix backend port channels and routes being displayed In `show interface portchannel` and `show ip route`, backend port channels and routes were being displayed. This is due to changes in sonic-net#13660. Fix these issues by switching to reading from PORTCHANNEL_MEMBERS table instead. Fixes sonic-net#14459. * Replace table name with constant Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

saiarcot895 added 2 commits February 3, 2023 11:49

Update tests and remove other references to member array

00ab627

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

saiarcot895 marked this pull request as ready for review February 6, 2023 22:20

saiarcot895 requested review from keboliu and qiluo-msft February 6, 2023 22:28

saiarcot895 requested a review from bingwang-ms February 10, 2023 19:58

qiluo-msft requested review from wen587 and ganglyu February 10, 2023 22:04

qiluo-msft reviewed Feb 10, 2023

View reviewed changes

ganglyu approved these changes Feb 11, 2023

View reviewed changes

Remove reference to members@ array from yang file

5c31781

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

saiarcot895 added 2 commits February 12, 2023 20:47

Update yang test files to reflect members array removal

fbb14c8

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

Update test script to check for a different leaf-list entry

53e3d60

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

ganglyu approved these changes Feb 17, 2023

View reviewed changes

wen587 approved these changes Feb 17, 2023

View reviewed changes

qiluo-msft approved these changes Feb 23, 2023

View reviewed changes

qiluo-msft merged commit 3e316cb into sonic-net:master Feb 23, 2023

saiarcot895 mentioned this pull request Feb 24, 2023

[bgp] Don't use portchannel members entry sonic-net/sonic-mgmt#7568

Merged

6 tasks

saiarcot895 added Request for 202205 Branch Request for 202211 Branch labels Feb 27, 2023

yxieca added the Approved for 202205 Branch label Feb 28, 2023

mssonicbld added the Cherry Pick Conflict_202205 label Feb 28, 2023

yxieca added the Included in 202205 Branch label Mar 15, 2023

This was referenced Mar 16, 2023

Fix KeyError: 'members' for test_inner_hashing JibinBao/sonic-mgmt#25

Closed

Fix KeyError: 'members' issue for ecmp inner_hashing cases sonic-net/sonic-mgmt#7766

Merged

nhe-NV mentioned this pull request Mar 17, 2023

[portchannel ]Fix bgp_gr_helper/iface_loopback action failure due to config_db change sonic-net/sonic-mgmt#7774

Closed

6 tasks

StormLiangMS added the Approved for 202211 Branch label Mar 19, 2023

mssonicbld added the Created PR to 202211 Branch label Mar 19, 2023

mssonicbld mentioned this pull request Mar 19, 2023

[action] [PR:13660] Don't create the members@ array in config_db for PC when reading from minigraph #14343

Merged

mssonicbld added Included in 202211 Branch and removed Approved for 202211 Branch Created PR to 202211 Branch labels Mar 20, 2023

anamehra mentioned this pull request Mar 27, 2023

chassis-packet: pc_lag_2 test fails due to inclusion of internal portchannels #14436

Closed

yxieca removed Cherry Pick Conflict_202205 Approved for 202205 Branch labels Mar 28, 2023

anamehra mentioned this pull request Mar 29, 2023

chassis: 'show interface portchannel' shows internal portchannels included #14459

Closed

saiarcot895 mentioned this pull request Mar 31, 2023

Fix backend port channels and routes being displayed #14479

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Don't create the members@ array in config_db for PC when reading from minigraph #13660

Don't create the members@ array in config_db for PC when reading from minigraph #13660

saiarcot895 commented Feb 3, 2023

saiarcot895 commented Feb 7, 2023

mssonicbld commented Feb 7, 2023

azure-pipelines bot commented Feb 7, 2023

qiluo-msft Feb 10, 2023 •

edited

Loading

saiarcot895 Feb 11, 2023

wen587 commented Feb 13, 2023

saiarcot895 commented Feb 17, 2023

wen587 left a comment

mssonicbld commented Feb 28, 2023

mssonicbld commented Mar 19, 2023

anamehra commented Mar 28, 2023

rlhui commented Mar 29, 2023

anamehra commented Mar 29, 2023

rlhui commented Mar 29, 2023

saiarcot895 commented Mar 31, 2023

Don't create the members@ array in config_db for PC when reading from minigraph #13660

Don't create the members@ array in config_db for PC when reading from minigraph #13660

Conversation

saiarcot895 commented Feb 3, 2023

Why I did it

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Description for the changelog

Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

saiarcot895 commented Feb 7, 2023

mssonicbld commented Feb 7, 2023

azure-pipelines bot commented Feb 7, 2023

qiluo-msft Feb 10, 2023 • edited Loading

Choose a reason for hiding this comment

saiarcot895 Feb 11, 2023

Choose a reason for hiding this comment

wen587 commented Feb 13, 2023

saiarcot895 commented Feb 17, 2023

wen587 left a comment

Choose a reason for hiding this comment

mssonicbld commented Feb 28, 2023

mssonicbld commented Mar 19, 2023

anamehra commented Mar 28, 2023

rlhui commented Mar 29, 2023

anamehra commented Mar 29, 2023

rlhui commented Mar 29, 2023

saiarcot895 commented Mar 31, 2023

qiluo-msft Feb 10, 2023 •

edited

Loading