[GCU] Handling type1 lists #2171

ghooo · 2022-05-18T11:24:11Z

What I did

Fixes #2034

Which lists where handled before in ConfigDb to YANG conversion?

Dictionary of key to Object e.g.

"TACPLUS_SERVER": {
    "1.1.1.1": {            <= Key: Object (i.e. {...})
        "priority": "1", 
        "tcp_port": "49"
    }, 
    "1.1.1.2": {
        "priority": "1", 
        "tcp_port": "49"
    },
    "1.1.1.3": {
        "priority": "1", 
        "tcp_port": "49"
    } 
}

List of values

"VLAN": {
    "Vlan1000": {
        "vlanid": "1000",
        "dhcp_servers": [    <= Values
            "192.0.0.1",
            "192.0.0.2",
            "192.0.0.3",
            "192.0.0.4"
        ]
    }
}

But there is no handling of Dictionary of Key to Value

"DOT1P_TO_TC_MAP": {
    "Dot1p_to_tc_map1": {    <= Key: Value
            "1": "1",
            "2": "2",
            "3": "1",
            "4": "2"
        }
    },

Refer to sonic-net/sonic-buildimage#7375 for more info about how Type 1 list ConfigDb is getting converted to SonicYang.

After checking how type1 is handled during ConfigDb to SonicYang conversion. Check the unit-tests here for converting ConfigDb Path to SonicYang xpath.

Also added CABLE_LENGTH to ADD_RACK and REMOVE_RACK tests.

How I did it

When handling a list, check if it is of type1. If that's the case call type1 list handling.

How to verify it

unit-test

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

generic_config_updater/gu_common.py

qiluo-msft · 2022-05-18T21:49:11Z

generic_config_updater/gu_common.py

+        # Example where the leaf specified is not the key:
+        #   xpath: /sonic-dot1p-tc-map:sonic-dot1p-tc-map/DOT1P_TO_TC_MAP/DOT1P_TO_TC_MAP_LIST[name='Dot1p_to_tc_map1']/DOT1P_TO_TC_MAP[dot1p='2']/tc
+        #   path: /DOT1P_TO_TC_MAP/Dot1p_to_tc_map1/2
+        next_token = xpath_tokens[token_index+1]


token_index

Protect for index out of range. #Closed

it is protected in line 777

let me add a comment to line 777 for clarification, and to indicate that it is the end of the xpath_tokens

How about token_index+1 > len(xpath_tokens)?

qiluo-msft · 2022-05-20T17:37:34Z

Please resolve conflict.

ghooo · 2022-05-20T17:47:28Z

Please resolve conflict.

Resolved

Update sonic-utilities submodule pointer to include the following: * [GCU] Handling type1 lists ([sonic-net#2171](sonic-net/sonic-utilities#2171)) * [yang] extend ConfigMgmt constructor to pass YANG options ([sonic-net#2118](sonic-net/sonic-utilities#2118)) * [dump] implement ACL modules ([sonic-net#2153](sonic-net/sonic-utilities#2153)) * show commands for SYSTEM READY ([sonic-net#1851](sonic-net/sonic-utilities#1851)) * [GCU] Handling non-compliant leaf-list with string values ([sonic-net#2174](sonic-net/sonic-utilities#2174)) * Add sonic-delayed.target to Application Extension .timer file generator ([sonic-net#2176](sonic-net/sonic-utilities#2176)) * [portconfig] Allow to configure interface mtu for physical ports ([#l](https://github.com/Azure/sonic-utilities/pull/l)) * Broadcast Unknown-multicast and Unknown-unicast Storm-control ([sonic-net#928](sonic-net/sonic-utilities#928)) * sonic-utils: initial support for link-training ([sonic-net#2071](sonic-net/sonic-utilities#2071)) * [portchannel] Added ACL/PBH binding checks to the port before getting added to portchannel ([sonic-net#2151](sonic-net/sonic-utilities#2151)) * Modify override testcase to cover PORT admin_status ([sonic-net#2165](sonic-net/sonic-utilities#2165)) * [GCU] Validate peer_group_range ip_range are correct ([sonic-net#2145](sonic-net/sonic-utilities#2145)) * [auto-ts] add memory check ([sonic-net#2116](sonic-net/sonic-utilities#2116)) * support new interface types CR8/SR8/KR8/LR8 which are brougnt by SAI V.1.10.2 ([sonic-net#2167](sonic-net/sonic-utilities#2167)) * [scripts/fast-reboot] Add option to include ssd-upgrader-part boot option with SONiC partition ([sonic-net#2150](sonic-net/sonic-utilities#2150)) * [config reload] Fix invalid rstrip. ([sonic-net#2157](sonic-net/sonic-utilities#2157)) * Accept 0 for queue and dscp ([sonic-net#2162](sonic-net/sonic-utilities#2162)) Signed-off-by: dprital <drorp@nvidia.com>

#### What I did Fixes #2034 Which lists where handled before in ConfigDb to YANG conversion? - Dictionary of key to Object e.g. ``` "TACPLUS_SERVER": { "1.1.1.1": { <= Key: Object (i.e. {...}) "priority": "1", "tcp_port": "49" }, "1.1.1.2": { "priority": "1", "tcp_port": "49" }, "1.1.1.3": { "priority": "1", "tcp_port": "49" } } ``` - List of values ``` "VLAN": { "Vlan1000": { "vlanid": "1000", "dhcp_servers": [ <= Values "192.0.0.1", "192.0.0.2", "192.0.0.3", "192.0.0.4" ] } } ``` - But there is no handling of Dictionary of Key to Value ``` "DOT1P_TO_TC_MAP": { "Dot1p_to_tc_map1": { <= Key: Value "1": "1", "2": "2", "3": "1", "4": "2" } }, ``` Refer to sonic-net/sonic-buildimage#7375 for more info about how Type 1 list ConfigDb is getting converted to SonicYang. After checking how type1 is handled during ConfigDb to SonicYang conversion. Check the unit-tests here for converting ConfigDb Path to SonicYang xpath. Also added CABLE_LENGTH to ADD_RACK and REMOVE_RACK tests. #### How I did it When handling a list, check if it is of type1. If that's the case call type1 list handling. #### How to verify it unit-test #### Previous command output (if the output of a command-line utility has changed) #### New command output (if the output of a command-line utility has changed)

yxieca · 2022-06-22T22:59:10Z

@ghooo cherry-picking this changed to 202205 branch causes PR test to fail, can you look into this issue?

#### What I did Fixes #2034 Which lists where handled before in ConfigDb to YANG conversion? - Dictionary of key to Object e.g. ``` "TACPLUS_SERVER": { "1.1.1.1": { <= Key: Object (i.e. {...}) "priority": "1", "tcp_port": "49" }, "1.1.1.2": { "priority": "1", "tcp_port": "49" }, "1.1.1.3": { "priority": "1", "tcp_port": "49" } } ``` - List of values ``` "VLAN": { "Vlan1000": { "vlanid": "1000", "dhcp_servers": [ <= Values "192.0.0.1", "192.0.0.2", "192.0.0.3", "192.0.0.4" ] } } ``` - But there is no handling of Dictionary of Key to Value ``` "DOT1P_TO_TC_MAP": { "Dot1p_to_tc_map1": { <= Key: Value "1": "1", "2": "2", "3": "1", "4": "2" } }, ``` Refer to sonic-net/sonic-buildimage#7375 for more info about how Type 1 list ConfigDb is getting converted to SonicYang. After checking how type1 is handled during ConfigDb to SonicYang conversion. Check the unit-tests here for converting ConfigDb Path to SonicYang xpath. Also added CABLE_LENGTH to ADD_RACK and REMOVE_RACK tests. #### How I did it When handling a list, check if it is of type1. If that's the case call type1 list handling. #### How to verify it unit-test #### Previous command output (if the output of a command-line utility has changed) #### New command output (if the output of a command-line utility has changed)

ghooo linked an issue May 18, 2022 that may be closed by this pull request

[GCU] Handle non-compliant leaf-list with string values #2170

Closed

ghooo removed a link to an issue May 18, 2022

[GCU] Handle non-compliant leaf-list with string values #2170

Closed

ghooo requested review from wen587 and qiluo-msft May 18, 2022 16:41

qiluo-msft requested a review from Junchao-Mellanox May 18, 2022 21:39

qiluo-msft reviewed May 18, 2022

View reviewed changes

generic_config_updater/gu_common.py Outdated Show resolved Hide resolved

qiluo-msft reviewed May 18, 2022

View reviewed changes

generic_config_updater/gu_common.py Outdated Show resolved Hide resolved

qiluo-msft reviewed May 18, 2022

View reviewed changes

This comment was marked as outdated.

Sign in to view

ghooo added 5 commits May 20, 2022 10:37

[GCU] Handling type1 lists

6d77480

updating ADD_RACK and REMOVE_RACK test cases

d185221

addressing comments

0ba1a8e

removing unused variable

5f48c97

minor fix

663ae2b

ghooo force-pushed the gcu_type1 branch from a9d5645 to 663ae2b Compare May 20, 2022 17:46

qiluo-msft approved these changes May 25, 2022

View reviewed changes

ghooo merged commit f5af780 into sonic-net:master May 25, 2022

dprital mentioned this pull request May 25, 2022

[submodule] Update sonic-utilities submodule sonic-net/sonic-buildimage#10928

Closed

6 tasks

This was referenced Jun 9, 2022

[submodule] Update sonic-utilities submodule ayurkiv-nvda/sonic-buildimage#22

Closed

[submodule] Update sonic-utilities submodule sonic-net/sonic-buildimage#11103

Closed

wen587 added the Request for 202205 Branch label Jun 17, 2022

yxieca added the Included in 202205 Branch label Jun 17, 2022

isabelmsft mentioned this pull request Jun 22, 2022

[GCU] Interface Replace Lanes test to expect op success sonic-net/sonic-mgmt#5859

Open

5 tasks

yxieca removed the Included in 202205 Branch label Jun 22, 2022

yxieca added Cherry Pick Conflict_202205 and removed Cherry Pick Conflict_202205 labels Jun 22, 2022

yxieca added the Included in 202205 Branch label Jun 23, 2022

ghooo mentioned this pull request Jun 24, 2022

SONiC Generic Update and Rollback - HLD sonic-net/SONiC#736

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[GCU] Handling type1 lists #2171

[GCU] Handling type1 lists #2171

ghooo commented May 18, 2022 •

edited

Loading

qiluo-msft May 18, 2022 •

edited

Loading

ghooo May 18, 2022

ghooo May 18, 2022

ghooo May 18, 2022

qiluo-msft May 20, 2022

ghooo May 20, 2022

This comment was marked as outdated.

qiluo-msft commented May 20, 2022

ghooo commented May 20, 2022

yxieca commented Jun 22, 2022

[GCU] Handling type1 lists #2171

[GCU] Handling type1 lists #2171

Conversation

ghooo commented May 18, 2022 • edited Loading

What I did

How I did it

How to verify it

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

qiluo-msft May 18, 2022 • edited Loading

Choose a reason for hiding this comment

ghooo May 18, 2022

Choose a reason for hiding this comment

ghooo May 18, 2022

Choose a reason for hiding this comment

ghooo May 18, 2022

Choose a reason for hiding this comment

qiluo-msft May 20, 2022

Choose a reason for hiding this comment

ghooo May 20, 2022

Choose a reason for hiding this comment

This comment was marked as outdated.

qiluo-msft commented May 20, 2022

ghooo commented May 20, 2022

yxieca commented Jun 22, 2022

ghooo commented May 18, 2022 •

edited

Loading

qiluo-msft May 18, 2022 •

edited

Loading